Index: branches/RC/core/units/users/users_config.php
===================================================================
diff -u -N -r9616 -r10025
--- branches/RC/core/units/users/users_config.php (.../users_config.php) (revision 9616)
+++ branches/RC/core/units/users/users_config.php (.../users_config.php) (revision 10025)
@@ -92,6 +92,12 @@
'user_groups_list' => Array('prefixes' => Array('u', 'u-ug_List'), 'format' => "#u_status# '#u_titlefield#' - !la_title_Groups! (#u-ug_recordcount#)"),
+ 'user_edit_group' => Array (
+ 'prefixes' => Array ('u', 'u-ug'),
+ 'edit_status_labels' => Array ('u-ug' => '!la_title_EditingMembership!'),
+ 'format' => "#u_status# '#u_titlefield#' - #u-ug_status# '#u-ug_titlefield#'",
+ ),
+
'tree_users' => Array('format' => '!la_section_overview!'),
),
Index: branches/RC/core/units/user_groups/user_groups_config.php
===================================================================
diff -u -N -r10005 -r10025
--- branches/RC/core/units/user_groups/user_groups_config.php (.../user_groups_config.php) (revision 10005)
+++ branches/RC/core/units/user_groups/user_groups_config.php (.../user_groups_config.php) (revision 10025)
@@ -7,15 +7,15 @@
'ParentPrefix' => 'g',
'ForeignKey' => 'GroupId',
'ParentTableKey' => 'GroupId',
-
+
'IDField' => 'PortalUserId',
-
+
'ListSQLs' => Array(
'' => ' SELECT %1$s.* %2$s FROM %1$s
LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId
LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId'
),
- 'ItemSQLs' => Array(
+ 'ItemSQLs' => Array(
'' => ' SELECT %1$s.* %2$s FROM %1$s
LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId
LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId'
@@ -65,6 +65,7 @@
'IDField' => 'GroupId',
+ 'TitleField' => 'GroupName',
'TableName' => TABLE_PREFIX.'UserGroup',
'ListSQLs' => Array( ''=>' SELECT %1$s.* %2$s FROM %1$s
Index: branches/RC/kernel/admin_templates/users/user_edit_group.tpl
===================================================================
diff -u -N
--- branches/RC/kernel/admin_templates/users/user_edit_group.tpl (revision 0)
+++ branches/RC/kernel/admin_templates/users/user_edit_group.tpl (revision 10025)
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: branches/RC/kernel/admin_templates/users/users_edit_groups.tpl
===================================================================
diff -u -N -r8929 -r10025
--- branches/RC/kernel/admin_templates/users/users_edit_groups.tpl (.../users_edit_groups.tpl) (revision 8929)
+++ branches/RC/kernel/admin_templates/users/users_edit_groups.tpl (.../users_edit_groups.tpl) (revision 10025)
@@ -17,11 +17,11 @@
//do not rename - this function is used in default grid for double click!
function edit()
{
-
+ std_edit_temp_item('u-ug', 'in-portal/users/user_edit_group');
}
a_toolbar = new ToolBar();
-
+
a_toolbar.AddButton( new ToolBarButton('select', '', function() {
submit_event('u','');
}
@@ -43,25 +43,26 @@
) );
a_toolbar.AddButton( new ToolBarSeparator('sep2') );
-
+
a_toolbar.AddButton( new ToolBarButton('in-portal:usertogroup', '::',
function() {
openSelector('u-ug', '', 'GroupId', '800x600');
} ) );
+ a_toolbar.AddButton( new ToolBarButton('edit', '', edit) );
a_toolbar.AddButton( new ToolBarButton('delete', '',
function() {
std_delete_items('u-ug');
} ) );
-
+
a_toolbar.AddButton( new ToolBarButton('in-portal:primary_group', '',
function() {
submit_event('u-ug','OnSetPrimary');
} ) );
a_toolbar.AddButton( new ToolBarSeparator('sep3') );
-
+
a_toolbar.AddButton( new ToolBarButton('view', '', function() {
show_viewmenu(a_toolbar,'view');
}