diff --git a/include/library/Crunchbutton/Admin.php b/include/library/Crunchbutton/Admin.php index fcdda3168..5702f4616 100644 --- a/include/library/Crunchbutton/Admin.php +++ b/include/library/Crunchbutton/Admin.php @@ -11,7 +11,17 @@ class Crunchbutton_Admin extends Cana_Table { } return $this->_timezone; } + + public function getPermissionsByGroups(){ + return c::db()->get( "SELECT ap.*, g.name as group_name FROM admin_permission ap + INNER JOIN admin_group ag ON ap.id_group = ap.id_group and ag.id_admin = {$this->id_admin} + INNER JOIN `group` g ON g.id_group = ag.id_group ORDER BY group_name, permission ASC" ); + } + public function getPermissionsByUser(){ + return c::db()->get( "SELECT * FROM admin_permission WHERE id_admin = {$this->id_admin}" ); + } + public function permission() { if (!isset($this->_permission)) { $this->_permission = new Crunchbutton_Acl_Admin($this); diff --git a/include/views/default/cockpit/permissions/groups/form.phtml b/include/views/default/cockpit/permissions/groups/form.phtml index 1bfaf16ad..7849aba4a 100644 --- a/include/views/default/cockpit/permissions/groups/form.phtml +++ b/include/views/default/cockpit/permissions/groups/form.phtml @@ -61,6 +61,7 @@ + id_group ) { ?>
Access @@ -73,6 +74,7 @@
+ diff --git a/include/views/default/cockpit/permissions/users/form.phtml b/include/views/default/cockpit/permissions/users/form.phtml index b895680b1..d05fbc83d 100644 --- a/include/views/default/cockpit/permissions/users/form.phtml +++ b/include/views/default/cockpit/permissions/users/form.phtml @@ -8,6 +8,7 @@ $admin = $this->admin; + $_permissions = new Crunchbutton_Admin_Permission(); ?>
@@ -120,6 +121,112 @@
+ id_admin ) { ?> +
+ getPermissionsByUser(); + + if( $userPermissions->count() > 0 ){ + ?> +
+
+ + Permissions of the user + +
+
+
+
    + +
  • + getPermissionInfo( $permission->permission ); + if( $info ){ + echo $info[ 'description' ]; + } + ?> +  permission ?> +
    • + +
+
+
+
+ groups(); + if( $groups->count() > 0 ){ + foreach( $groups as $group ){ + $groupPermissions = $group->permissions(); + ?> +
+
+ + Permissions of the group "name ?>" + +
+
+
+
    + +
  • + getPermissionInfo( $permission->permission ); + if( $info ){ + echo $info[ 'description' ]; + } + ?> +  permission ?> +
    • + +
+
+
+
+ +
+ + + +