Jingga/oms-News
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-News.git synced 2026-02-17 08:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change permission check from int to string

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-03-09 22:26:22 +01:00
parent 1c6d1321af
commit 915bd91d7b
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Admin/Install/Navigation.install.json
View File

@ -10,7 +10,7 @@
"icon": null, "icon": null,
"order": 40, "order": 40,
"from": "News", "from": "News",
"permission": null, "permission": { "type": null, "element": null },
"parent": 1000201001, "parent": 1000201001,
"children": [ "children": [
{ {
@ -24,7 +24,7 @@
"icon": null, "icon": null,
"order": 1, "order": 1,
"from": "News", "from": "News",
"permission": null, "permission": { "type": null, "element": null },
"parent": 1000701001, "parent": 1000701001,
"children": [] "children": []
}, },
@ -39,7 +39,7 @@
"icon": null, "icon": null,
"order": 5, "order": 5,
"from": "News", "from": "News",
"permission": null, "permission": { "type": null, "element": null },
"parent": 1000701001, "parent": 1000701001,
"children": [] "children": []
}, },
@ -54,7 +54,7 @@
"icon": null, "icon": null,
"order": 10, "order": 10,
"from": "News", "from": "News",
"permission": null, "permission": { "type": null, "element": null },
"parent": 1000701001, "parent": 1000701001,
"children": [] "children": []
}, },
@ -69,7 +69,7 @@
"icon": null, "icon": null,
"order": 15, "order": 15,
"from": "News", "from": "News",
"permission": null, "permission": { "type": null, "element": null },
"parent": 1000701001, "parent": 1000701001,
"children": [] "children": []
} }

20
Controller.php
View File

@ -107,7 +107,7 @@ class Controller extends ModuleAbstract implements WebInterface
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( 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'); $view->setTemplate('/Web/Backend/Error/403_inline');
$response->getHeader()->setStatusCode(RequestStatusCode::R_403); $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@ -162,7 +162,7 @@ class Controller extends ModuleAbstract implements WebInterface
if ($article->getCreatedBy()->getId() !== $accountId if ($article->getCreatedBy()->getId() !== $accountId
&& !$this->app->accountManager->get($accountId)->hasPermission( && !$this->app->accountManager->get($accountId)->hasPermission(
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::ARTICLE, $article->getId()) PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ARTICLE, $article->getId())
) { ) {
$view->setTemplate('/Web/Backend/Error/403_inline'); $view->setTemplate('/Web/Backend/Error/403_inline');
$response->getHeader()->setStatusCode(RequestStatusCode::R_403); $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@ -191,7 +191,7 @@ class Controller extends ModuleAbstract implements WebInterface
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::ARCHIVE) PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ARCHIVE)
) { ) {
$view->setTemplate('/Web/Backend/Error/403_inline'); $view->setTemplate('/Web/Backend/Error/403_inline');
$response->getHeader()->setStatusCode(RequestStatusCode::R_403); $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@ -222,7 +222,7 @@ class Controller extends ModuleAbstract implements WebInterface
$view = new View($this->app, $request, $response); $view = new View($this->app, $request, $response);
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::ARTICLE) PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ARTICLE)
) { ) {
$view->setTemplate('/Web/Backend/Error/403_inline'); $view->setTemplate('/Web/Backend/Error/403_inline');
$response->getHeader()->setStatusCode(RequestStatusCode::R_403); $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@ -285,7 +285,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function apiNewsUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiNewsUpdate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::ARTICLE) PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ARTICLE)
) { ) {
$response->set('news_update', null); $response->set('news_update', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403); $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@ -341,7 +341,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function apiNewsCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiNewsCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::ARTICLE) PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ARTICLE)
) { ) {
$response->set('news_create', null); $response->set('news_create', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403); $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@ -399,7 +399,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function apiNewsGet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiNewsGet(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::ARTICLE) PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ARTICLE)
) { ) {
$response->set('news_read', null); $response->set('news_read', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403); $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@ -449,7 +449,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function apiBadgeCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiBadgeCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::BADGE) PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::BADGE)
) { ) {
$response->set('badge_create', null); $response->set('badge_create', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403); $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@ -551,7 +551,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function apiNewsDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiNewsDelete(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::ARTICLE) PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::ARTICLE)
) { ) {
$response->set('news_delete', null); $response->set('news_delete', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403); $response->getHeader()->setStatusCode(RequestStatusCode::R_403);
@ -583,7 +583,7 @@ class Controller extends ModuleAbstract implements WebInterface
public function apiDeleteNewsBadge(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */ public function apiDeleteNewsBadge(RequestAbstract $request, ResponseAbstract $response, $data = null) /* : void */
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_ID, PermissionState::BADGE) PermissionType::DELETE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::BADGE)
) { ) {
$response->set('badge_delete', null); $response->set('badge_delete', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403); $response->getHeader()->setStatusCode(RequestStatusCode::R_403);