Index: trunk/core/units/user_groups/user_groups_config.php
===================================================================
diff -u -r6625 -r7635
--- trunk/core/units/user_groups/user_groups_config.php	(.../user_groups_config.php)	(revision 6625)
+++ trunk/core/units/user_groups/user_groups_config.php	(.../user_groups_config.php)	(revision 7635)
@@ -14,81 +14,63 @@
 																'ForeignKey'		=>	'PortalUserId',
 																'ParentTableKey' 	=> 	'PortalUserId',
 															),
-
 									),
 
-					'ItemClass'			=>	Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
+					'ItemClass'			=>	Array('class'=>'UserGroups_DBItem','file'=>'user_groups_dbitem.php','build_event'=>'OnItemBuild'),
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
-					'EventHandlerClass'	=>	Array('class'=>'kDBEventHandler','file'=>'','build_event'=>'OnBuild'),
+					'EventHandlerClass'	=>	Array('class'=>'UserGroupsEventHandler','file'=>'user_groups_eh.php','build_event'=>'OnBuild'),
 					'TagProcessorClass' =>	Array('class'=>'kDBTagProcessor','file'=>'','build_event'=>'OnBuild'),
 					'AutoLoad'			=>	true,
 
-					'QueryString'		=>	Array(
-												1	=>	'id',
-												2	=>	'page',
-												3	=>	'event',
-											),
+					'QueryString' => Array (
+						1	=>	'id',
+						2	=>	'page',
+						3	=>	'event',
+					),
 
 					'IDField'			=>	'GroupId',
-					'StatusField'		=>	Array('UserStatus'),
 
 					'TableName'			=>	TABLE_PREFIX.'UserGroup',
 
 					'ListSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s FROM %1$s
-															LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId AND %1$s.PrimaryGroup = 1
-															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON u.PortalUserId = %1$s.PortalUserId'),
+															LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId'),
 
 					'ItemSQLs'			=>	Array(	''=>'	SELECT %1$s.* %2$s FROM %1$s
-															LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId AND %1$s.PrimaryGroup = 1
-															LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON u.PortalUserId = %1$s.PortalUserId'),
+															LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId'),
 
 					'AutoDelete'		=>	true,
 					'AutoClone'			=> 	true,
 
-					'CalculatedFields'	=>	Array(
-													''	=>	Array(
-																'Login'			=>	'u.Login',
-																'FirstName'		=>	'u.FirstName',
-																'LastName'		=>	'u.LastName',
-																'Email'			=>	'u.Email',
-																'PrimaryGroup'	=>	'g.Name',
-																'CreatedOn'		=>	'u.CreatedOn',
-																'UserStatus'	=>	'u.Status'
-															),
-											),
+					'CalculatedFields'	=>	Array (
+						''	=>	Array(
+							'GroupName' => 'g.Name',
+						),
+					),
 
 					'Fields'			=>	Array(
-													'PortalUserId' => Array('type' => 'int','not_null' => '1','default' => '0'),
-													'GroupId' => Array(),
-													'MembershipExpires' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''),
-													'PrimaryGroup' => Array('type' => 'int','not_null' => '1','default' => '1'),
-													'ExpirationReminderSent' => Array('type' => 'int','not_null' => '1','default' => '0'),
+						'PortalUserId'				=>	Array('type' => 'int'),
+						'GroupId'					=>	Array('type' => 'int', 'not_null' => 1, 'default' => 1),
+						'MembershipExpires' 		=> Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => ''),
+						'PrimaryGroup'				=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1),
+						'ExpirationReminderSent'	=>	Array('type' => 'int', 'not_null' => 1, 'default' => 0),
 									        ),
 
-					'VirtualFields'		=>	Array(
-													'Login'			=>	Array('type' => 'string'),
-													'FirstName'		=>	Array('type' => 'string'),
-													'LastName'		=>	Array('type' => 'string'),
-													'Email'			=>	Array('type' => 'string'),
-													'PrimaryGroup'	=>	Array('type' => 'string'),
-													'CreatedOn'		=>	Array('type' => 'int', 'formatter' => 'kDateFormatter', 'not_null' => 1, 'default' => '#NOW#'),
-													'UserStatus'	=>	Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled', 2 => 'la_Pending'), 'use_phrases' => 1, 'not_null' => '1','default' => 2),
-											),
+					'VirtualFields'	=> Array (
+						'GroupName' => Array('type' => 'string'),
+					),
 
 
 					'Grids'	=> Array(
-										'Default'	=>	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_checkbox_td'),
-																		'LastName'		=> Array( 'title'=>'la_col_LastName'),
-																		'FirstName'		=> Array( 'title'=>'la_col_FirstName'),
-																		'Email'			=> Array( 'title'=>'la_col_Email'),
+						'Default'	=>	Array(
+							'Icons' => Array ('default' => 'icon16_group.gif'),
+							'Fields' => Array(
+								'GroupId'			=> Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td'),
+								'GroupName'			=> Array ('title'=>'la_col_GroupName'),
 																		'PrimaryGroup'	=> Array( 'title'=>'la_col_PrimaryGroup'),
-																		'CreatedOn_formatted'	=>	Array('title' => 'la_col_CreatedOn', 'sort_field' => 'CreatedOn'),
-																	),
-														),
-								),
+								'MembershipExpires'	=>	Array ('title' => 'la_col_MembershipExpires', 'data_block' => 'grid_membership_td'),
+							),
+						),
+					),
 
 	);