Index: trunk/core/units/groups/groups_config.php =================================================================== diff -u -N -r7391 -r7635 --- trunk/core/units/groups/groups_config.php (.../groups_config.php) (revision 7391) +++ trunk/core/units/groups/groups_config.php (.../groups_config.php) (revision 7635) @@ -39,23 +39,22 @@ 'groups_edit_additional_permissions' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_AdditionalPermissions!" ), - 'groups_select' => Array('prefixes' => Array('g_List'), 'format' => "!la_title_Groups! (#g_recordcount#) - !la_title_SelectGroup!"), + 'select_group' => Array('prefixes' => Array('g.user_List'), 'format' => "!la_title_Groups! (#g.user_recordcount#) - !la_title_SelectGroup!"), ), 'PermSection' => Array('main' => 'in-portal:user_groups'), 'TableName' => TABLE_PREFIX.'PortalGroup', 'ListSQLs' => Array( - '' => ' - SELECT %1$s.* %2$s FROM %1$s', - 'total' => ' - SELECT %1$s.* %2$s FROM %1$s + '' => 'SELECT %1$s.* %2$s FROM %1$s', + 'total' => 'SELECT %1$s.* %2$s + FROM %1$s LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON ug.GroupId = %1$s.GroupId', ), - 'ItemSQLs' => Array('' => ' - SELECT %1$s.* %2$s FROM %1$s + 'ItemSQLs' => Array('' => ' SELECT %1$s.* %2$s + FROM %1$s LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON ug.GroupId = %1$s.GroupId'), 'ListSortings' => Array( @@ -87,37 +86,43 @@ ), 'Grids' => Array( - 'Default' => Array( - 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), - 'Fields' => Array( - 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'), - 'Name' => Array('title' => 'la_col_GroupName'), - 'UserCount' => Array('title' => 'la_col_UserCount'), - ), - ), + 'Default' => Array( + 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + 'Fields' => Array( + 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'), + 'Name' => Array('title' => 'la_col_GroupName'), + 'UserCount' => Array('title' => 'la_col_UserCount'), + ), + ), - 'Radio' => Array( - 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), - 'Fields' => Array( - 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_radio_td'), - 'Name' => Array('title' => 'la_col_GroupName'), - 'Description' => Array('title' => 'la_col_Description'), - ), - ), + 'UserGroups' => Array ( + 'Icons' => Array (1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + 'Fields' => Array ( + 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'), + 'Name' => Array('title' => 'la_col_GroupName'), + ), + ), + + 'Radio' => Array ( + 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + 'Fields' => Array( + 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_radio_td'), + 'Name' => Array('title' => 'la_col_GroupName'), + 'Description' => Array('title' => 'la_col_Description'), + ), + ), + + 'GroupSelector' => Array ( + 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + 'Fields' => Array( + 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'), + 'Name' => Array('title' => 'la_col_GroupName'), + 'Description' => Array('title' => 'la_col_Description'), + ), + ), + ), + - /*'GroupSelector' => Array( - 'Icons' => Array(0 => 'icon16_user_disabled.gif', 1 => 'icon16_user.gif', 2 => 'icon16_user_pending.gif'), - 'Fields' => Array( - 'Login' => Array('title' => 'la_col_Username', 'data_block' => 'grid_radio_td'), - 'LastName' => Array( 'title'=>'la_col_LastName'), - 'FirstName' => Array( 'title'=>'la_col_FirstName'), - 'Email' => Array( 'title'=>'la_col_Email'), - 'PrimaryGroup' => Array( 'title'=>'la_col_PrimaryGroup'), - 'CreatedOn_formatted' => Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'), - ), - ),*/ - ), - ); ?> \ No newline at end of file