Index: trunk/core/units/groups/groups_config.php =================================================================== diff -u -N -r5431 -r6093 --- trunk/core/units/groups/groups_config.php (.../groups_config.php) (revision 5431) +++ trunk/core/units/groups/groups_config.php (.../groups_config.php) (revision 6093) @@ -2,12 +2,12 @@ $config = Array( 'Prefix' => 'g', - + 'ItemClass' => Array('class' => 'GroupsItem', 'file' => 'groups_item.php', 'build_event' => 'OnItemBuild'), 'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), 'EventHandlerClass' => Array('class' => 'GroupsEventHandler', 'file' => 'groups_event_handler.php','build_event'=>'OnBuild'), 'TagProcessorClass' => Array('class' => 'kDBTagProcessor', 'file' => '','build_event'=>'OnBuild'), - + 'AutoLoad' => true, 'QueryString' => Array( @@ -18,32 +18,32 @@ ), 'IDField' => 'GroupId', - + 'StatusField' => Array('Enabled'), - + 'TitleField' => 'Name', - + 'TitlePresets' => Array( 'default' => Array( 'new_status_labels' => Array('g' => '!la_title_Adding_Group!'), 'edit_status_labels' => Array('g' => '!la_title_Editing_Group!'), 'new_titlefield' => Array('g' => '!la_title_New_Group!'), ), - + 'groups_list' => Array('prefixes' => Array('g_List'), 'format' => "!la_title_Groups! (#g_recordcount#)"), - + 'groups_edit' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_General!"), - + 'groups_edit_users' => Array('prefixes' => Array('g', 'g-ug_List'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Users! (#g-ug_recordcount#)" ), - + 'groups_edit_permissions' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Permissions!" ), - + '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!"), ), - + 'PermSection' => Array('main' => 'in-portal:user_groups'), - + 'Sections' => Array( 'in-portal:user_groups' => Array( 'parent' => 'in-portal:users', @@ -54,16 +54,22 @@ 'priority' => 2, 'type' => stTREE, ), - ), - + ), + 'TableName' => TABLE_PREFIX.'PortalGroup', - 'ListSQLs' => Array('' => ' 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 - LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON ug.GroupId = %1$s.GroupId'), - + 'ListSQLs' => Array( + '' => ' + 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 + LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON ug.GroupId = %1$s.GroupId'), + 'ListSortings' => Array( '' => Array( 'Sorting' => Array('Name' => 'asc'), @@ -76,7 +82,7 @@ 'UserCount' => 'COUNT(ug.PortalUserId)', ), ), - + 'Fields' => Array ( 'GroupId' => Array(), 'Name' => Array('type' => 'string', 'not_null' => '1', 'required' => 1, 'default' => ''), @@ -87,11 +93,11 @@ 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => '1','default' => 1), 'ResourceId' => Array('type' => 'int','not_null' => '1','default' => '0'), ), - + 'VirtualFields' => Array( 'UserCount' => Array('type' => 'int', 'default' => 0), ), - + 'Grids' => Array( 'Default' => Array( 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), @@ -101,7 +107,7 @@ 'UserCount' => Array('title' => 'la_col_UserCount'), ), ), - + 'Radio' => Array( 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), 'Fields' => Array( @@ -110,7 +116,7 @@ '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(