Index: branches/RC/core/units/user_groups/user_groups_config.php
===================================================================
diff -u -N -r9241 -r10005
--- branches/RC/core/units/user_groups/user_groups_config.php	(.../user_groups_config.php)	(revision 9241)
+++ branches/RC/core/units/user_groups/user_groups_config.php	(.../user_groups_config.php)	(revision 10005)
@@ -7,7 +7,42 @@
 																'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(	
+																	''	=>	'	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'
+																),
+																'CalculatedFields'	=>	Array (
+																	''	=>	Array(
+																		'UserName' => 'CONCAT(u.LastName, \' \', u.FirstName)',
+																		'UserLogin' => 'u.Login',
+																	),
+																),
+																'VirtualFields'	=> Array (
+																	'UserName' => Array('type' => 'string'),
+																	'UserLogin' => Array('type' => 'string'),
+																),
+																'Grids'	=> Array(
+																	'GroupUsers'	=>	Array(
+																		'Icons' => Array ('default' => 'icon16_group.gif'),
+																		'Fields' => Array(
+																			'PortalUserId'			=> Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
+																			'UserName'			=> Array ('title'=>'la_col_UserFirstLastName'),
+																			'UserLogin'			=> Array ('title'=>'la_col_Login'),
+																			'PrimaryGroup'	=> Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter'),
+																			'MembershipExpires'	=>	Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter'),
+																		),
+																	),
+																),
+															),
 
 											'u-ug'	=>	Array(
 																'ParentPrefix'		=>	'u',
@@ -39,11 +74,12 @@
 															LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId'),
 
 					'AutoDelete'		=>	true,
-					'AutoClone'			=> 	true,
+					'AutoClone'			=> 	false,
 
 					'CalculatedFields'	=>	Array (
 						''	=>	Array(
 							'GroupName' => 'g.Name',
+							'GroupDescription' => 'g.Description',
 						),
 					),
 
@@ -57,6 +93,7 @@
 
 					'VirtualFields'	=> Array (
 						'GroupName' => Array('type' => 'string'),
+						'GroupDescription' => Array('type' => 'string'),
 					),
 
 
@@ -66,6 +103,7 @@
 							'Fields' => Array(
 								'GroupId'			=> Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'),
 								'GroupName'			=> Array ('title'=>'la_col_GroupName'),
+								'GroupDescription'			=> Array ('title'=>'la_col_Description'),
 								'PrimaryGroup'	=> Array( 'title'=>'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter'),
 								'MembershipExpires'	=>	Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td', 'filter_block' => 'grid_date_range_filter'),
 							),