Index: branches/5.0.x/core/install/install_schema.sql
===================================================================
diff -u -N -r12591 -r12638
--- branches/5.0.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 12591)
+++ branches/5.0.x/core/install/install_schema.sql	(.../install_schema.sql)	(revision 12638)
@@ -207,18 +207,16 @@
 );
 
 CREATE TABLE PortalGroup (
-  GroupId int(11) NOT NULL auto_increment,
-  Name varchar(255) NOT NULL default '',
-  Description varchar(255) default NULL,
-  CreatedOn int(10) unsigned default NULL,
-  System tinyint(4) NOT NULL default '0',
-  Personal tinyint(4) NOT NULL default '0',
-  Enabled tinyint(4) NOT NULL default '1',
-  ResourceId int(11) NOT NULL default '0',
-  FrontRegistration tinyint(3) unsigned NOT NULL default '0',
-  PRIMARY KEY  (GroupId),
-  UNIQUE KEY Name (Name),
-  UNIQUE KEY ResourceId (ResourceId),
+  GroupId int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL DEFAULT '',
+  Description varchar(255) DEFAULT NULL,
+  CreatedOn int(10) unsigned DEFAULT NULL,
+  System tinyint(4) NOT NULL DEFAULT '0',
+  Personal tinyint(4) NOT NULL DEFAULT '0',
+  Enabled tinyint(4) NOT NULL DEFAULT '1',
+  FrontRegistration tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (GroupId),
+  UNIQUE KEY `Name` (`Name`),
   KEY Personal (Personal),
   KEY Enabled (Enabled),
   KEY CreatedOn (CreatedOn)
Index: branches/5.0.x/core/install/upgrades.sql
===================================================================
diff -u -N -r12593 -r12638
--- branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 12593)
+++ branches/5.0.x/core/install/upgrades.sql	(.../upgrades.sql)	(revision 12638)
@@ -1505,4 +1505,7 @@
 
 UPDATE Phrase SET PhraseKey = UPPER(Phrase);
 
-UPDATE Modules SET Loaded = 1 WHERE `Name` = 'In-Portal';
\ No newline at end of file
+UPDATE Modules SET Loaded = 1 WHERE `Name` = 'In-Portal';
+
+# ===== v 5.0.2 =====
+ALTER TABLE PortalGroup DROP ResourceId;
\ No newline at end of file
Index: branches/5.0.x/core/units/groups/groups_config.php
===================================================================
diff -u -N -r12495 -r12638
--- branches/5.0.x/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 12495)
+++ branches/5.0.x/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 12638)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: groups_config.php 12495 2009-09-15 04:09:10Z dmitrya $
+* @version	$Id: groups_config.php 12638 2009-09-29 14:00:40Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -17,7 +17,7 @@
 	$config = Array (
 		'Prefix' => 'g',
 
-		'ItemClass' => Array ('class' => 'GroupsItem', 'file' => 'groups_item.php', 'build_event' => 'OnItemBuild'),
+		'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', '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' => 'GroupTagProcessor', 'file' => 'group_tp.php', 'build_event' => 'OnBuild'),
@@ -111,7 +111,6 @@
 			'System' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			'Personal' => Array ('type' => 'int','not_null' => 1, 'default' => 0),
 			'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),
 			'FrontRegistration' => Array (
 				'type' => 'int',
 				'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1,
Index: branches/5.0.x/core/units/groups/groups_item.php
===================================================================
diff -u -N
--- branches/5.0.x/core/units/groups/groups_item.php	(revision 12299)
+++ branches/5.0.x/core/units/groups/groups_item.php	(revision 0)
@@ -1,35 +0,0 @@
-<?php
-/**
-* @version	$Id: groups_item.php 12299 2009-08-17 01:51:27Z dmitrya $
-* @package	In-Portal
-* @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
-* @license      GNU/GPL
-* In-Portal is Open Source software.
-* This means that this software may have been modified pursuant
-* the GNU General Public License, and as distributed it includes
-* or is derivative of works licensed under the GNU General Public License
-* or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
-*/
-
-	defined('FULL_PATH') or die('restricted access!');
-
-	class GroupsItem extends kDBItem {
-
-		function Create($force_id = false, $system_create = false)
-		{
-			if (!$this->Validate()) return false;
-			$this->SetDBField('ResourceId', $this->Application->NextResourceId());
-
-			return parent::Create();
-		}
-
-		function Update($id = null, $system_update = false)
-		{
-			$this->VirtualFields['ResourceId'] = Array();
-			$ret = parent::Update($id, $system_update);
-			unset($this->VirtualFields['ResourceId']);
-
-			return $ret;
-		}
-	}
\ No newline at end of file
Index: branches/5.0.x/core/install/install_data.sql
===================================================================
diff -u -N -r12587 -r12638
--- branches/5.0.x/core/install/install_data.sql	(.../install_data.sql)	(revision 12587)
+++ branches/5.0.x/core/install/install_data.sql	(.../install_data.sql)	(revision 12638)
@@ -274,11 +274,11 @@
 
 INSERT INTO IdGenerator VALUES ('100');
 
-INSERT INTO PortalGroup VALUES (15, 'Everyone', 'Everyone', 0, 1, 0, 1, 15, 0);
-INSERT INTO PortalGroup VALUES (13, 'Member', '', '1054738682', 0, 0, 1, 13, 1);
-INSERT INTO PortalGroup VALUES (12, 'Subscribers', '', '1054738670', 0, 0, 1, 12, 0);
-INSERT INTO PortalGroup VALUES (14, 'Guest', 'Guest User', '0', 1, 0, 1, 14, 0);
-INSERT INTO PortalGroup VALUES (11, 'admin', '', '1054738405', 0, 0, 1, 11, 0);
+INSERT INTO PortalGroup VALUES (15, 'Everyone', 'Everyone', 0, 1, 0, 1, 0);
+INSERT INTO PortalGroup VALUES (13, 'Member', '', '1054738682', 0, 0, 1, 1);
+INSERT INTO PortalGroup VALUES (12, 'Subscribers', '', '1054738670', 0, 0, 1, 0);
+INSERT INTO PortalGroup VALUES (14, 'Guest', 'Guest User', '0', 1, 0, 1, 0);
+INSERT INTO PortalGroup VALUES (11, 'admin', '', '1054738405', 0, 0, 1, 0);
 
 INSERT INTO StdDestinations VALUES (1, 1, DEFAULT, 'la_country_AFG', 'AFG', 'AF');
 INSERT INTO StdDestinations VALUES (2, 1, DEFAULT, 'la_country_ALB', 'ALB', 'AL');