Index: trunk/core/admin_templates/groups/groups_edit_permissions.tpl
===================================================================
diff -u -N
--- trunk/core/admin_templates/groups/groups_edit_permissions.tpl (revision 0)
+++ trunk/core/admin_templates/groups/groups_edit_permissions.tpl (revision 4603)
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ [x]
+ |
+
+
+
+ |
" id="adm[0][]">
+
+  .gif" border="0" alt="" align="absmiddle"/>
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: trunk/kernel/admin_templates/tree.tpl
===================================================================
diff -u -N -r4579 -r4603
--- trunk/kernel/admin_templates/tree.tpl (.../tree.tpl) (revision 4579)
+++ trunk/kernel/admin_templates/tree.tpl (.../tree.tpl) (revision 4603)
@@ -70,30 +70,7 @@
-
-
-
-
-
Index: trunk/kernel/admin_templates/groups/groups_edit_permissions.tpl
===================================================================
diff -u -N
--- trunk/kernel/admin_templates/groups/groups_edit_permissions.tpl (revision 0)
+++ trunk/kernel/admin_templates/groups/groups_edit_permissions.tpl (revision 4603)
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ [x]
+ |
+
+
+
+ |
" id="adm[0][]">
+
+ .gif" border="0" alt="" align="absmiddle"/>
+
+ |
+
+
+ |
+
+ |
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: trunk/core/admin_templates/groups/groups_edit_users.tpl
===================================================================
diff -u -N -r4596 -r4603
--- trunk/core/admin_templates/groups/groups_edit_users.tpl (.../groups_edit_users.tpl) (revision 4596)
+++ trunk/core/admin_templates/groups/groups_edit_users.tpl (.../groups_edit_users.tpl) (revision 4603)
@@ -5,6 +5,8 @@
+
+
Index: trunk/admin/install/inportal_schema.sql
===================================================================
diff -u -N -r4446 -r4603
--- trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 4446)
+++ trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 4603)
@@ -708,14 +708,14 @@
CREATE TABLE PortalUserCustomData (
CustomDataId int(11) NOT NULL auto_increment,
ResourceId int(10) unsigned NOT NULL default '0',
- UNIQUE KEY ResourceId (ResourceId),
+ KEY ResourceId (ResourceId),
PRIMARY KEY (CustomDataId)
)
# --------------------------------------------------------
CREATE TABLE CategoryCustomData (
CustomDataId int(11) NOT NULL auto_increment,
ResourceId int(10) unsigned NOT NULL default '0',
- UNIQUE KEY ResourceId (ResourceId),
+ KEY ResourceId (ResourceId),
PRIMARY KEY (CustomDataId)
)
# --------------------------------------------------------
Index: trunk/core/units/groups/groups_config.php
===================================================================
diff -u -N -r4597 -r4603
--- trunk/core/units/groups/groups_config.php (.../groups_config.php) (revision 4597)
+++ trunk/core/units/groups/groups_config.php (.../groups_config.php) (revision 4603)
@@ -35,6 +35,8 @@
'groups_edit_users' => Array('prefixes' => Array('g', 'g-ug_List'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Users! (#g-ug_recordcount#)" ),
+ 'groups_edit_permissions' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Permissions!" ),
+
'groups_select' => Array('prefixes' => Array('g_List'), 'format' => "!la_title_Groups! (#g_recordcount#) - !la_title_SelectGroup!"),
),
Index: trunk/kernel/admin_templates/groups/groups_edit_users.tpl
===================================================================
diff -u -N -r4596 -r4603
--- trunk/kernel/admin_templates/groups/groups_edit_users.tpl (.../groups_edit_users.tpl) (revision 4596)
+++ trunk/kernel/admin_templates/groups/groups_edit_users.tpl (.../groups_edit_users.tpl) (revision 4603)
@@ -5,6 +5,8 @@
+
+
Index: trunk/kernel/units/groups/groups_config.php
===================================================================
diff -u -N -r4597 -r4603
--- trunk/kernel/units/groups/groups_config.php (.../groups_config.php) (revision 4597)
+++ trunk/kernel/units/groups/groups_config.php (.../groups_config.php) (revision 4603)
@@ -35,6 +35,8 @@
'groups_edit_users' => Array('prefixes' => Array('g', 'g-ug_List'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Users! (#g-ug_recordcount#)" ),
+ 'groups_edit_permissions' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Permissions!" ),
+
'groups_select' => Array('prefixes' => Array('g_List'), 'format' => "!la_title_Groups! (#g_recordcount#) - !la_title_SelectGroup!"),
),
Index: trunk/kernel/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r4524 -r4603
--- trunk/kernel/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 4524)
+++ trunk/kernel/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 4603)
@@ -285,6 +285,20 @@
return preg_replace("/\r\n|\n/", '', $ret);
}
+ function ListSectionPermissions($params)
+ {
+ $section_data =& $this->Tree[ $params['section_name'] ];
+ $block_params = array_merge_recursive2($section_data, Array('name' => $params['render_as']));
+
+ $ret = '';
+ foreach ($section_data['permissions'] as $perm_name) {
+ if (preg_match('/^advanced:(.*)/', $perm_name) != $params['type']) continue;
+ $block_params['perm_name'] = $perm_name;
+ $ret .= $this->Application->ParseBlock($block_params);
+ }
+ return $ret;
+ }
+
function ModuleInclude($params)
{
foreach ($params as $param_name => $param_value) {
Index: trunk/admin/install/upgrades/inportal_upgrade_v1.1.9.sql
===================================================================
diff -u -N -r4330 -r4603
--- trunk/admin/install/upgrades/inportal_upgrade_v1.1.9.sql (.../inportal_upgrade_v1.1.9.sql) (revision 4330)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.1.9.sql (.../inportal_upgrade_v1.1.9.sql) (revision 4603)
@@ -1,4 +1,7 @@
INSERT INTO Events (Event, Enabled, FromUserId, Module, Description, Type) VALUES ('COMMON.FOOTER', 1, 0, 'In-Portal', 'la_event_common.footer', 1);
ALTER TABLE CustomField ADD IsSystem TINYINT UNSIGNED NOT NULL;
+ALTER TABLE CategoryCustomData ADD INDEX (ResourceId);
+ALTER TABLE PortalUserCustomData ADD INDEX (ResourceId);
+
UPDATE Modules SET Version = '1.1.9' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: trunk/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r4524 -r4603
--- trunk/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 4524)
+++ trunk/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 4603)
@@ -285,6 +285,20 @@
return preg_replace("/\r\n|\n/", '', $ret);
}
+ function ListSectionPermissions($params)
+ {
+ $section_data =& $this->Tree[ $params['section_name'] ];
+ $block_params = array_merge_recursive2($section_data, Array('name' => $params['render_as']));
+
+ $ret = '';
+ foreach ($section_data['permissions'] as $perm_name) {
+ if (preg_match('/^advanced:(.*)/', $perm_name) != $params['type']) continue;
+ $block_params['perm_name'] = $perm_name;
+ $ret .= $this->Application->ParseBlock($block_params);
+ }
+ return $ret;
+ }
+
function ModuleInclude($params)
{
foreach ($params as $param_name => $param_value) {
Index: trunk/kernel/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r4490 -r4603
--- trunk/kernel/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 4490)
+++ trunk/kernel/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 4603)
@@ -44,7 +44,7 @@
- |
+ |