From d0689aa6620f49639233c5db8ceb9b19309880c1 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Fri, 9 Mar 2018 22:26:22 +0100
Subject: [PATCH] Change permission check from int to string

---
 Admin/Install/Navigation.install.json | 6 +++---
 Controller.php                        | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index b5e80c1..94dd8f3 100644
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -10,7 +10,7 @@
         "icon": null,
         "order": 75,
         "from": "Editor",
-        "permission": null,
+        "permission": { "type": null, "element": null },
         "parent": 1003301001,
         "children": [
             {
@@ -24,7 +24,7 @@
                 "icon": null,
                 "order": 1,
                 "from": "Editor",
-                "permission": null,
+                "permission": { "type": null, "element": null },
                 "parent": 1005301001,
                 "children": []
             },
@@ -39,7 +39,7 @@
                 "icon": null,
                 "order": 15,
                 "from": "Editor",
-                "permission": null,
+                "permission": { "type": null, "element": null },
                 "parent": 1005301001,
                 "children": []
             }
diff --git a/Controller.php b/Controller.php
index 160b9fc..a786cb7 100644
--- a/Controller.php
+++ b/Controller.php
@@ -122,7 +122,7 @@ class Controller extends ModuleAbstract implements WebInterface
         $view = new View($this->app, $request, $response);
 
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::DOC)
+            PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DOC)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -153,7 +153,7 @@ class Controller extends ModuleAbstract implements WebInterface
         $view = new View($this->app, $request, $response);
 
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::DASHBOARD)
+            PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DASHBOARD)
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -188,7 +188,7 @@ class Controller extends ModuleAbstract implements WebInterface
 
         if ($doc->getCreatedBy()->getId() !== $accountId
             && !$this->app->accountManager->get($accountId)->hasPermission(
-                PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::DOC, $doc->getId())
+                PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DOC, $doc->getId())
         ) {
             $view->setTemplate('/Web/Backend/Error/403_inline');
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@@ -224,7 +224,7 @@ class Controller extends ModuleAbstract implements WebInterface
     public function apiEditorCreate(RequestAbstract $request, ResponseAbstract $response, $data = null)
     {
         if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
-            PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::DOC)
+            PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DOC)
         ) {
             $response->set('editor_create', null);
             $response->getHeader()->setStatusCode(RequestStatusCode::R_403);