[permissionmanager] changed description to tooltips

5 files changed, 26 insertions, 6 deletions

diff --git a/inc/user.inc.php b/inc/user.inc.php
index f7688b00..3606f025 100644
--- a/inc/user.inc.php
+++ b/inc/user.inc.php
@@ -26,10 +26,16 @@ class User
 		return self::$user['fullname'];
 	}
 
-	public static function hasPermission($permission)
+	public static function hasPermission($permission, $locationid = NULL)
 	{
 		if (!self::isLoggedIn())
 			return false;
+		if (Module::get("permissionmanager")) {
+			require_once "modules/permissionmanager/inc/permissionutil.inc.php";
+			$module = Request::get("do", false);
+			$permission = $module ? $module.".".$permission : $permission;
+			return PermissionUtil::userHasPermission(self::$user['userid'], $permission, $locationid);
+		}
 		return (self::$user['permissions'] & (Permission::get($permission) | Permission::get('superadmin'))) != 0;
 	}
 
diff --git a/modules-available/permissionmanager/style.css b/modules-available/permissionmanager/style.css
index f1f8e250..e1fac370 100644
--- a/modules-available/permissionmanager/style.css
+++ b/modules-available/permissionmanager/style.css
@@ -47,10 +47,13 @@
 }
 
 .disabled {
-    pointer-events: none;
     opacity: 0.6;
 }
 
+input[type='checkbox']:disabled {
+    cursor: inherit;
+}
+
 .module-toggle-group {
     width: 100%;
     margin-top: 20px;
@@ -83,4 +86,4 @@
         -webkit-column-count: 2;
         column-count: 2;
     }
-}
\ No newline at end of file
+}
diff --git a/modules-available/permissionmanager/templates/permission.html b/modules-available/permissionmanager/templates/permission.html
index 3cc0bf97..b28b9099 100644
--- a/modules-available/permissionmanager/templates/permission.html
+++ b/modules-available/permissionmanager/templates/permission.html
@@ -1,6 +1,6 @@
-<li class='list-group-item'>
+<li class='list-group-item' title="{{description}}" data-toggle="tooltip" data-placement="left">
 	<div class='checkbox'>
 		<input name='permissions[]' value='{{id}}' type='checkbox' class='form-control'>
-		<label>{{name}} - {{description}}</label>
+		<label>{{name}}</label>
 	</div>
 </li>
\ No newline at end of file
diff --git a/modules-available/permissionmanager/templates/roleeditor.html b/modules-available/permissionmanager/templates/roleeditor.html
index d21b3fbd..bfabf4af 100644
--- a/modules-available/permissionmanager/templates/roleeditor.html
+++ b/modules-available/permissionmanager/templates/roleeditor.html
@@ -45,6 +45,7 @@
 	selectedPermissions = "{{selectedPermissions}}";
 
 	document.addEventListener("DOMContentLoaded", function () {
+
 		$('#select-location').selectize({
 			allowEmptyOption: false,
 			maxItems: null,
@@ -138,6 +139,11 @@
 			button.addClass("btn-primary");
 		}
 
+
+		$('[data-toggle="tooltip"]').tooltip({
+			container: 'body',
+			trigger : 'hover'
+		});
 	});
 
 </script>
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 6bd908a5..4845d5be 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -124,7 +124,12 @@ class Page_Statistics_Reporting extends Page
 			Render::addTemplate('columnChooser', $data);
 
 			$data['data'] = $this->fetchData(GETDATA_PRINTABLE);
-			Render::addTemplate('table-' . $this->type, $data);
+
+			if (User::hasPermission("table.view.$this->type"))
+				Render::addTemplate('table-' . $this->type, $data);
+			else
+				Message::addError('main.no-permission');
+
 		}
 	}