Store entity type in addition to gid in og_menu schema

I say please include an update script.

both hook_update_N and hook_schema are needed in .install file
its not that much work though

already a lot of people are using the dev branch, we cant just ask them to update their db's manually

Finally got a chance to test this out. I found the following:

1. When adding a new menu to a group (group/node/[nid]/admin/menus/add) I get an error message (Notice: Undefined index: og_imenu_gid in og_menu_edit_menu_form_submit() (line 866). Looks to be a typo.
2. When I attempt to save a menu (/admin/structure/menu/manage/[menu-name]/edit) I get an error message (Notice: Undefined index: og_menu_group_type in og_menu_edit_menu_form_submit() (line 865). Looks like this form is missing the group_type.
3. _og_menu_autocomplete() is only return groups with an entity type of 'node'.

As for 3)
Maybe we should integrate with Better Automcomplete (BAC) like linkit does.
http://drupal.org/project/linkit
https://github.com/betamos/Better-Autocomplete
http://drupal.org/sandbox/sven.lauer/1777988

Tested out the new patch. 1 is solved, and I also could not duplicate 2.

Thanks for the heads up
been too busy with other things and forgot about this.
Committed. Let's see where this goes :)

I'm having the same problem as in #8 issue 2 :
When I attempt to save a menu (/admin/structure/menu/manage/[menu-name]/edit) I get an error message (Notice: Undefined index: og_menu_group_type in og_menu_edit_menu_form_submit() (line 865). Looks like this form is missing the group_type.

This happens when I create a new menu by the normal drupal way of adding menus (/admin/structure/menu/add).

When i looked at the code. The form is altered and og_menu_edit_menu_form_submit handler is added.
But the gid is not required and when provided it is of format "groupname [gid:XX]". The group_type is not provided.

The other form (og_menu_edit_menu_form) that also uses this submit handler provides the correct values for this submit handler.

The function og_menu_update_menu in og_menu_edit_menu_form_submit is always executed even when not in a og context.

function og_menu_edit_menu_form_submit($form, &$form_state) {
  $group_type = $form['og_menu_group_type']['#value'];
  $gid = $form['og_menu_gid']['#value'];
  $menu_name = $form['#insert'] ? $menu_name = 'menu-' . $form['menu_name']['#value'] : $form['og_menu_name']['#value'];
  og_menu_update_menu($menu_name, $gid, $group_type);
}

I made a workaround patch that handles the extra checks, but maybe this should be reevaluated, so that the gid is always provided in the same format, the group type is always present and only executed when needed.

function og_menu_edit_menu_form_submit($form, &$form_state) {
  if (!empty($form_state['values']['og_menu_gid'])) {
    $matches = array();
    // This submit handler is called from two different forms which encode the gid differently.
    preg_match('/\[gid:(\d+)\]/', $form_state['values']['og_menu_gid'], $matches);
    $gid = (!empty($matches[1])) ? $matches[1] : $form_state['values']['og_menu_gid'];
    $menu_name = $form['#insert'] ? $menu_name = 'menu-' . $form['menu_name']['#value'] : $form['menu_name']['#value'];
    og_menu_update_menu($menu_name, $gid, 'node');
  }
}

@Tom Robert
Thanks for that patch.
I restored part of the code from 7.x-2.x which also seems to be working.
It's a similar approach, but a different regex. Too tired now to look into it but it worked and it still does.

You are right that it should be reevaluated.
The autocomplete and select "widgets" there should be made $group_type aware so that non-node entities can be used.
This turned out to be not so simple in the current og, hence this change is postponed in favor of just fixing this bug.

Fix has been committed:
http://drupalcode.org/project/og_menu.git/blobdiff/8ea2a6c8627a32725851a...

@bulldozer2003
What happens if someone affiliates an existing menu with og? We wont change the machine name there, so we cant just assume all og menus follow this naming convention.
If you look at the diff, I actually restored the og-menu naming convention: http://drupalcode.org/project/og_menu.git/blobdiff/8ea2a6c8627a32725851a...

EDIT:

Woah, creating new menus is failing miserably for me now. Menus added for a group are being added as standard menus, but the og_menu is still being written to the database. It looks like maybe they're just being named incorrectly.

Can you please provide the exact steps to replicate this?

I opened a new issue to move towards supporting arbitrary entity types as groups: #2270725: Make OG Menu work with any type of group entity