Add ability to view permissions inherited when viewing an ACL row in …

…a grid
modxcms · Nov 22, 2010 · 77c27f2 · 77c27f2
1 parent 81a1753
commit 77c27f2
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 15 deletions.
diff --git a/core/docs/changelog.txt b/core/docs/changelog.txt
@@ -2,6 +2,7 @@
 This file shows the changes in recent releases of MODx. The most current release is usually the
 development release, and is only shown to give an idea of what's currently in the pipeline.
 
+- Add ability to view permissions inherited when viewing an ACL row in a grid
 - [#2834] Fix issue where constraint class was not set on new FC rules
 - [#2819] Fix issue with FC rules and execution order due to setting default templates, constraints
 - [#2830] Permit ability to change FC Set Template when editing a FC Set

diff --git a/core/model/modx/processors/security/access/usergroup/category/getlist.php b/core/model/modx/processors/security/access/usergroup/category/getlist.php
@@ -47,7 +47,8 @@
     `modAccessCategory`.*,
     `Target`.`category` AS `name`,
     CONCAT(`Role`.`name`," - ",`modAccessCategory`.`authority`) AS `authority_name`,
-    `Policy`.`name` AS `policy_name`
+    `Policy`.`name` AS `policy_name`,
+    `Policy`.`data` AS `policy_data`
 ');
 $c->sortby($sort,$dir);
 if ($isLimit) $c->limit($limit,$start);
@@ -59,6 +60,18 @@
     $aclArray = $acl->toArray();
     if (empty($aclArray['name'])) $aclArray['name'] = '('.$modx->lexicon('none').')';
 
+    /* get permissions list */
+    $data = $aclArray['policy_data'];
+    unset($aclArray['policy_data']);
+    $data = $modx->fromJSON($data);
+    if (!empty($data)) {
+        $permissions = array();
+        foreach ($data as $perm => $v) {
+            $permissions[] = $perm;
+        }
+        $aclArray['permissions'] = implode(', ',$permissions);
+    }
+
     $aclArray['menu'] = array(
         array(
             'text' => $modx->lexicon('access_category_update'),

diff --git a/core/model/modx/processors/security/access/usergroup/context/getlist.php b/core/model/modx/processors/security/access/usergroup/context/getlist.php
@@ -46,7 +46,8 @@
 $c->select('
     `modAccessContext`.*,
     CONCAT(`Role`.`name`," - ",`modAccessContext`.`authority`) AS `authority_name`,
-    `Policy`.`name` AS `policy_name`
+    `Policy`.`name` AS `policy_name`,
+    `Policy`.`data` AS `policy_data`
 ');
 $c->sortby($sort,$dir);
 if ($isLimit) $c->limit($limit,$start);
@@ -56,6 +57,19 @@
 $list = array();
 foreach ($acls as $acl) {
     $aclArray = $acl->toArray();
+
+    /* get permissions list */
+    $data = $aclArray['policy_data'];
+    unset($aclArray['policy_data']);
+    $data = $modx->fromJSON($data);
+    if (!empty($data)) {
+        $permissions = array();
+        foreach ($data as $perm => $v) {
+            $permissions[] = $perm;
+        }
+        $aclArray['permissions'] = implode(', ',$permissions);
+    }
+
     $cls = '';
     if (($aclArray['target'] == 'web' || $aclArray['target'] == 'mgr') && $aclArray['policy_name'] == 'Administrator') {} else {
         $cls .= 'pedit premove';

diff --git a/core/model/modx/processors/security/access/usergroup/resourcegroup/getlist.php b/core/model/modx/processors/security/access/usergroup/resourcegroup/getlist.php
@@ -47,7 +47,8 @@
     `modAccessResourceGroup`.*,
     `Target`.`name` AS `name`,
     CONCAT(`Role`.`name`," - ",`modAccessResourceGroup`.`authority`) AS `authority_name`,
-    `Policy`.`name` AS `policy_name`
+    `Policy`.`name` AS `policy_name`,
+    `Policy`.`data` AS `policy_data`
 ');
 $c->sortby($sort,$dir);
 if ($isLimit) $c->limit($limit,$start);
@@ -58,6 +59,19 @@
 foreach ($acls as $acl) {
     $aclArray = $acl->toArray();
 
+    /* get permissions list */
+    $data = $aclArray['policy_data'];
+    unset($aclArray['policy_data']);
+    $data = $modx->fromJSON($data);
+    if (!empty($data)) {
+        $permissions = array();
+        foreach ($data as $perm => $v) {
+            $permissions[] = $perm;
+        }
+        $aclArray['permissions'] = implode(', ',$permissions);
+    }
+
+
     $aclArray['menu'] = array(
         array(
             'text' => $modx->lexicon('access_rgroup_update'),

diff --git a/manager/assets/modext/widgets/security/modx.grid.user.group.category.js b/manager/assets/modext/widgets/security/modx.grid.user.group.category.js
@@ -1,6 +1,11 @@
 
 MODx.grid.UserGroupCategory = function(config) {
     config = config || {};
+    this.exp = new Ext.grid.RowExpander({
+        tpl : new Ext.Template(
+            '<p class="desc">{permissions}</p>'
+        )
+    });
     Ext.applyIf(config,{
         id: 'modx-grid-user-group-categories'
         ,url: MODx.config.connectors_url+'security/access/usergroup/category.php'
@@ -10,8 +15,9 @@ MODx.grid.UserGroupCategory = function(config) {
         }
         ,paging: true
         ,hideMode: 'offsets'
-        ,fields: ['id','target','name','principal','authority','authority_name','policy','policy_name','context_key','menu']
-        ,columns: [{
+        ,fields: ['id','target','name','principal','authority','authority_name','policy','policy_name','context_key','permissions','menu']
+        ,plugins: [this.exp]
+        ,columns: [this.exp,{
             header: _('category')
             ,dataIndex: 'name'
             ,width: 120

diff --git a/manager/assets/modext/widgets/security/modx.grid.user.group.context.js b/manager/assets/modext/widgets/security/modx.grid.user.group.context.js
@@ -1,17 +1,23 @@
 
 MODx.grid.UserGroupContext = function(config) {
     config = config || {};
+    this.exp = new Ext.grid.RowExpander({
+        tpl : new Ext.Template(
+            '<p class="desc">{permissions}</p>'
+        )
+    });
     Ext.applyIf(config,{
         id: 'modx-grid-user-group-contexts'
         ,url: MODx.config.connectors_url+'security/access/usergroup/context.php'
         ,baseParams: {
             action: 'getList'
             ,usergroup: config.usergroup
         }
-        ,fields: ['id','target','principal','authority','authority_name','policy','policy_name','cls']
+        ,fields: ['id','target','principal','authority','authority_name','policy','policy_name','permissions','cls']
         ,paging: true
         ,hideMode: 'offsets'
-        ,columns: [{
+        ,plugins: [this.exp]
+        ,columns: [this.exp,{
             header: _('context')
             ,dataIndex: 'target'
             ,width: 120

diff --git a/manager/assets/modext/widgets/security/modx.grid.user.group.resource.js b/manager/assets/modext/widgets/security/modx.grid.user.group.resource.js
@@ -1,6 +1,11 @@
 
 MODx.grid.UserGroupResourceGroup = function(config) {
     config = config || {};
+    this.exp = new Ext.grid.RowExpander({
+        tpl : new Ext.Template(
+            '<p class="desc">{permissions}</p>'
+        )
+    });
     Ext.applyIf(config,{
         id: 'modx-grid-user-group-resource-groups'
         ,url: MODx.config.connectors_url+'security/access/usergroup/resourcegroup.php'
@@ -10,8 +15,9 @@ MODx.grid.UserGroupResourceGroup = function(config) {
         }
         ,paging: true
         ,hideMode: 'offsets'
-        ,fields: ['id','target','name','principal','authority','authority_name','policy','policy_name','context_key','menu']
-        ,columns: [{
+        ,fields: ['id','target','name','principal','authority','authority_name','policy','policy_name','context_key','permissions','menu']
+        ,plugins: [this.exp]
+        ,columns: [this.exp,{
             header: _('resource_group')
             ,dataIndex: 'name'
             ,width: 120

diff --git a/manager/templates/default/css/index.css b/manager/templates/default/css/index.css
@@ -1163,4 +1163,4 @@ ul.modx-tag-list li.modx-tag-checked {
 
 .modx-policy-permissions-grid td {
     cursor: pointer;
-}
+}
diff --git a/manager/templates/default/css/xtheme-modx.css b/manager/templates/default/css/xtheme-modx.css
@@ -832,11 +832,15 @@ ul.x-tab-strip li.x-tab-strip-active  {
 }
 
 .x-grid3-row-expanded .x-grid3-row-body {
-	background-color:#f7f9f2;
-	border:1px solid #DDC3DF;
-	color:#868686;
-	margin:10px 15px 20px 0;
-	padding:10px;
+    background-color:#f7f9f2;
+    border:1px solid #DDC3DF;
+    color:#868686;
+    margin:10px 15px 20px 0;
+    padding:10px;
+    word-wrap: break-word;
+}
+.x-grid3-row-expanded .x-grid3-row-body .desc {
+    word-wrap: break-word;
 }
 
 .x-grid3-row-alt{