Jingga/oms-Navigation
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Navigation.git synced 2026-02-12 14:58:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix nav permission load

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-03-24 11:23:03 +01:00
parent ff336b944f
commit 737dd6e491
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Models/Navigation.php
View File

@ -65,7 +65,7 @@ class Navigation
* *
* @since 1.0.0 * @since 1.0.0
*/ */
private function __construct(RequestAbstract $request, Account $account, DatabasePool $dbPool = null) private function __construct(RequestAbstract $request, Account $account, DatabasePool $dbPool)
{ {
$this->dbPool = $dbPool; $this->dbPool = $dbPool;
$this->load($request->getHash(), $account); $this->load($request->getHash(), $account);
@ -110,14 +110,15 @@ class Navigation
PermissionType::READ, PermissionType::READ,
null, null,
null, null,
$link[0]['from'], $link[0]['permission']['type'], (string) $link[0]['nav_from'],
$link[0]['permission']['type']['element'] (int) $link[0]['nav_permission_type'],
(int) $link[0]['nav_permission_element']
); );
if ($isReadable) { if ($isReadable) {
$tempNav[$id][0]['readable'] = true; $tempNav[$id][0]['readable'] = true;
$this->setReadable($tempNav, $tempNav[$id][0]['paremt']); $this->setReadable($tempNav, $tempNav[$id][0]['nav_parent']);
} }
} }
@ -133,13 +134,13 @@ class Navigation
{ {
if (isset($nav[$parent])) { if (isset($nav[$parent])) {
$nav[$parent][0]['readable'] = true; $nav[$parent][0]['readable'] = true;
}
if (isset($nav[$nav[$parent][0]['parent']]) if (isset($nav[$nav[$parent][0]['nav_parent']])
&& (!isset($nav[$nav[$parent][0]['parent']][0]['readable']) && (!isset($nav[$nav[$parent][0]['nav_parent']][0]['readable'])
|| !$nav[$nav[$parent][0]['parent']][0]['readable']) || !$nav[$nav[$parent][0]['nav_parent']][0]['readable'])
) { ) {
$this->setReadable($nav, $nav[$parent][0]['parent']); $this->setReadable($nav, $nav[$parent][0]['nav_parent']);
}
} }
} }
@ -156,7 +157,7 @@ class Navigation
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public static function getInstance(RequestAbstract $hashes = null, Account $account, DatabasePool $dbPool = null) public static function getInstance(RequestAbstract $hashes = null, Account $account, DatabasePool $dbPool)
{ {
if (!isset(self::$instance)) { if (!isset(self::$instance)) {
if (!isset($hashes) || !isset($dbPool)) { if (!isset($hashes) || !isset($dbPool)) {