Index: branches/5.3.x/core/units/user_groups/user_groups_config.php
===================================================================
diff -u -N -r15677 -r15986
--- branches/5.3.x/core/units/user_groups/user_groups_config.php	(.../user_groups_config.php)	(revision 15677)
+++ branches/5.3.x/core/units/user_groups/user_groups_config.php	(.../user_groups_config.php)	(revision 15986)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: user_groups_config.php 15677 2013-01-17 18:52:50Z alex $
+* @version	$Id: user_groups_config.php 15986 2013-10-07 14:37:54Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -22,8 +22,6 @@
 			'ForeignKey' => 'GroupId',
 			'ParentTableKey' => 'GroupId',
 
-			'IDField' => 'PortalUserId',
-
 			'ListSQLs' => Array (
 				'' => '	SELECT %1$s.* %2$s FROM %1$s
 						LEFT JOIN '.TABLE_PREFIX.'UserGroups g ON %1$s.GroupId = g.GroupId
@@ -45,7 +43,7 @@
 				'GroupUsers' => Array (
 					'Icons' => Array ('default' => 'icon16_item.png'),
 					'Fields' => Array (
-						'PortalUserId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+						'Id' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
 						'UserName' => Array ('title' => 'la_col_UserFirstLastName', 'width' => 200, ),
 						'UserLogin' => Array ('title' => 'column:la_fld_Username', 'width' => 100, ),
 						'PrimaryGroup' => Array ( 'title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 100, ),
@@ -62,7 +60,7 @@
 		),
 	),
 
-	'ItemClass' => Array ('class' => 'UserGroups_DBItem', 'file' => 'user_groups_dbitem.php', 'build_event' => 'OnItemBuild'),
+	'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'),
 	'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
 	'EventHandlerClass' => Array ('class' => 'UserGroupsEventHandler', 'file' => 'user_groups_eh.php', 'build_event' => 'OnBuild'),
 	'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
@@ -76,7 +74,7 @@
 		4 => 'event',
 	),
 
-	'IDField' => 'GroupId',
+	'IDField' => 'Id',
 
 	'TitleField' => 'GroupName',
 	'TableName' => TABLE_PREFIX.'UserGroupRelations',
@@ -100,6 +98,7 @@
 	),
 
 	'Fields' => Array (
+		'Id' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'PortalUserId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'GroupId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 		'MembershipExpires' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => null),
@@ -124,7 +123,7 @@
 				1 => 'icon16_primary.png'
 			),
 			'Fields' => Array (
-				'GroupId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
+				'Id' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter', 'width' => 60, ),
 				'GroupName' => Array ('width' => 100, ),
 				'GroupDescription' => Array ('title' => 'column:la_fld_Description', 'width' => 150, ),
 				'PrimaryGroup' => Array ( 'title' => 'la_col_PrimaryGroup', 'filter_block' => 'grid_options_filter', 'width' => 150, ),