Index: trunk/kernel/admin_templates/categories/ci_blocks.tpl =================================================================== diff -u -N -r5102 -r5231 --- trunk/kernel/admin_templates/categories/ci_blocks.tpl (.../ci_blocks.tpl) (revision 5102) +++ trunk/kernel/admin_templates/categories/ci_blocks.tpl (.../ci_blocks.tpl) (revision 5231) @@ -15,4 +15,14 @@ + + + + + + + +
+ +
\ No newline at end of file Index: trunk/admin/users/group_select.php =================================================================== diff -u -N -r3683 -r5231 --- trunk/admin/users/group_select.php (.../group_select.php) (revision 3683) +++ trunk/admin/users/group_select.php (.../group_select.php) (revision 5231) @@ -86,7 +86,7 @@ $SelectorType = 'radio'; $exclude_sql = 'SELECT DISTINCT(GroupId) FROM '.TABLE_PREFIX.'Permissions - WHERE CatId = '.$application->GetVar('CatId'); + WHERE CatId = '.$application->GetVar('CatId').' AND Type = 0'; break; case 'adduser_groups': Index: trunk/admin/install/upgrades/inportal_upgrade_v1.2.1.sql =================================================================== diff -u -N -r5185 -r5231 --- trunk/admin/install/upgrades/inportal_upgrade_v1.2.1.sql (.../inportal_upgrade_v1.2.1.sql) (revision 5185) +++ trunk/admin/install/upgrades/inportal_upgrade_v1.2.1.sql (.../inportal_upgrade_v1.2.1.sql) (revision 5231) @@ -62,4 +62,8 @@ ALTER TABLE Category ADD COLUMN l1_Name varchar(255) NOT NULL default '' AFTER Name, ADD INDEX (l1_Name(5)), ADD COLUMN l2_Name varchar(255) NOT NULL default '' AFTER l1_Name, ADD INDEX (l2_Name(5)), ADD COLUMN l3_Name varchar(255) NOT NULL default '' AFTER l2_Name, ADD INDEX (l3_Name(5)), ADD COLUMN l4_Name varchar(255) NOT NULL default '' AFTER l3_Name, ADD INDEX (l4_Name(5)), ADD COLUMN l5_Name varchar(255) NOT NULL default '' AFTER l4_Name, ADD INDEX (l5_Name(5)), ADD COLUMN l1_Description text NOT NULL AFTER Description, ADD INDEX (l1_Description(5)), ADD COLUMN l2_Description text NOT NULL AFTER l1_Description, ADD INDEX (l2_Description(5)), ADD COLUMN l3_Description text NOT NULL AFTER l2_Description, ADD INDEX (l3_Description(5)), ADD COLUMN l4_Description text NOT NULL AFTER l3_Description, ADD INDEX (l4_Description(5)), ADD COLUMN l5_Description text NOT NULL AFTER l4_Description, ADD INDEX (l5_Description(5)); +ALTER TABLE Permissions ADD UNIQUE PermIndex (Permission, GroupId, CatId, Type); +REPLACE INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.VIEW', 11, 1, 0, 0); + + UPDATE Modules SET Version = '1.2.1' WHERE Name = 'In-Portal'; \ No newline at end of file Index: trunk/admin/install/inportal_schema.sql =================================================================== diff -u -N -r5185 -r5231 --- trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 5185) +++ trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 5231) @@ -340,7 +340,8 @@ PermissionValue int(11) NOT NULL default '0', Type tinyint(4) NOT NULL default '0', CatId int(11) NOT NULL default '0', - PRIMARY KEY (PermissionId) + PRIMARY KEY (PermissionId), + UNIQUE KEY PermIndex (Permission,GroupId,CatId,Type) ) # -------------------------------------------------------- Index: trunk/core/admin_templates/categories/ci_blocks.tpl =================================================================== diff -u -N -r5102 -r5231 --- trunk/core/admin_templates/categories/ci_blocks.tpl (.../ci_blocks.tpl) (revision 5102) +++ trunk/core/admin_templates/categories/ci_blocks.tpl (.../ci_blocks.tpl) (revision 5231) @@ -15,4 +15,14 @@ + + + + + + + +
+ +
\ No newline at end of file Index: trunk/admin/install/inportal_data.sql =================================================================== diff -u -N -r5180 -r5231 --- trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 5180) +++ trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 5231) @@ -264,12 +264,7 @@ INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('LOGIN', 11, 1, 1, 0); INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('LOGIN', 12, 1, 1, 0); INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('ADMIN', 11, 1, 1, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.VIEW', 15, 1, 0, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.ADD', 15, 0, 0, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.DELETE', 15, 0, 0, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.ADD.PENDING', 15, 0, 0, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.MODIFY', 15, 0, 0, 0); -INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('FAVORITES', 15, 0, 0, 0); +INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.VIEW', 11, 1, 0, 0); INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:root.view', 11, 1, 1, 0); INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:site.view', 11, 1, 1, 0); INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('in-portal:browse.view', 11, 1, 1, 0);