From 9001567bd710a4aec6ca5eb7c484503779983aa6 Mon Sep 17 00:00:00 2001
From: Udo Walter
Date: Tue, 28 Mar 2017 15:21:36 +0200
Subject: [permission-manager] changed module id to module name

---
 modules-available/permissionmanager/page.inc.php              | 10 ++++++++--
 modules-available/permissionmanager/templates/roleEditor.html |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'modules-available/permissionmanager')

diff --git a/modules-available/permissionmanager/page.inc.php b/modules-available/permissionmanager/page.inc.php
index 053c099d..ef280c11 100644
--- a/modules-available/permissionmanager/page.inc.php
+++ b/modules-available/permissionmanager/page.inc.php
@@ -83,12 +83,13 @@ class Page_PermissionManager extends Page
 			$permissions = PermissionUtil::getPermissions();
 			$permissionHTML = "";
 			foreach ($permissions as $k => $v) {
+				$name = Dictionary::translateFileModule($k, "module", "module_name");
 				$permissionHTML .= "
 				<div id='$k' class='panel panel-primary module-box' style='display: none;'>
 					<div class='panel-heading'>
 						<div class='checkbox'>
 							<input name='permissions[]' value='$k.*' type='checkbox' class='form-control'>
-							<label>$k</label>
+							<label>$name</label>
 						</div>
 					</div>
 					<div class='panel-body'>
@@ -98,7 +99,12 @@ class Page_PermissionManager extends Page
 			}
 
 			$data["locations"] = GetData::getLocations($selectedLocations);
-			$data["moduleNames"] = array_keys($permissions);
+			$data["moduleNames"] = array();
+			foreach (array_keys($permissions) as $moduleid) {
+				$data["moduleNames"][] = array("id" => $moduleid,
+					"name" => Dictionary::translateFileModule($moduleid, "module", "module_name"));
+			}
+
 			$data["permissionHTML"] = $permissionHTML;
 			Render::addTemplate('roleEditor', $data);
 		}
diff --git a/modules-available/permissionmanager/templates/roleEditor.html b/modules-available/permissionmanager/templates/roleEditor.html
index 68569caa..99cf3053 100644
--- a/modules-available/permissionmanager/templates/roleEditor.html
+++ b/modules-available/permissionmanager/templates/roleEditor.html
@@ -29,7 +29,7 @@
 		<div class="col-md-3">
 			<div class="btn-group-vertical module-toggle-group" role="group">
 				{{#moduleNames}}
-				<button id="button-{{.}}" type="button" class="btn btn-default module-toggle">{{.}}</button>
+				<button id="button-{{id}}" type="button" class="btn btn-default module-toggle" data-moduleid="{{id}}">{{name}}</button>
 				{{/moduleNames}}
 			</div>
 		</div>
@@ -69,7 +69,7 @@
 
 		$(".module-toggle").click(function () {
 			var button = $(this);
-			var moduleBox = $("#" + button.text());
+			var moduleBox = $("#" + button.data("moduleid"));
 			if (button.hasClass("btn-default")) {
 				button.removeClass("btn-default");
 				button.addClass("btn-primary");
-- 
cgit v1.2.3-55-g7522