Index: trunk/core/units/groups/groups_config.php =================================================================== diff -u -N -r5186 -r5253 --- trunk/core/units/groups/groups_config.php (.../groups_config.php) (revision 5186) +++ trunk/core/units/groups/groups_config.php (.../groups_config.php) (revision 5253) @@ -96,7 +96,8 @@ 'Default' => Array( 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), 'Fields' => Array( - 'Name' => Array('title' => 'la_col_GroupName', 'data_block' => 'grid_checkbox_td'), + 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'), + 'Name' => Array('title' => 'la_col_GroupName'), 'UserCount' => Array('title' => 'la_col_UserCount'), ), ), Index: trunk/kernel/units/groups/groups_config.php =================================================================== diff -u -N -r5186 -r5253 --- trunk/kernel/units/groups/groups_config.php (.../groups_config.php) (revision 5186) +++ trunk/kernel/units/groups/groups_config.php (.../groups_config.php) (revision 5253) @@ -96,7 +96,8 @@ 'Default' => Array( 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), 'Fields' => Array( - 'Name' => Array('title' => 'la_col_GroupName', 'data_block' => 'grid_checkbox_td'), + 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'), + 'Name' => Array('title' => 'la_col_GroupName'), 'UserCount' => Array('title' => 'la_col_UserCount'), ), ), Index: trunk/admin/category/permcacheupdate.php =================================================================== diff -u -N -r5176 -r5253 --- trunk/admin/category/permcacheupdate.php (.../permcacheupdate.php) (revision 5176) +++ trunk/admin/category/permcacheupdate.php (.../permcacheupdate.php) (revision 5253) @@ -108,15 +108,15 @@ $has_deny = array(); - foreach ($this->Deny as $perm => $groups) { + /*foreach ($this->Deny as $perm => $groups) { if (count($groups) > 0) { $values[] = '('.$this->CatId.', '.$perm.', "", "'.join(',', $groups).'")'; $has_deny[] = $perm; } - } + }*/ foreach ($this->Allow as $perm => $groups) { - if (in_array($perm, $has_deny)) continue; +// if (in_array($perm, $has_deny)) continue; if (count($groups) > 0) { $values[] = '(' .$this->CatId. ', ' .$perm. ', "' .join(',', $groups). '", "")'; }