From 98e100b377d18216d86ca54d3590d0ba38cb55bd Mon Sep 17 00:00:00 2001 From: Sam Georges Date: Sun, 9 Nov 2014 12:35:10 +1100 Subject: [PATCH] Refs #729 - Fixes CMS permissions, should not show "pages" content by default --- modules/backend/classes/NavigationManager.php | 12 ++- modules/backend/layouts/_sidenav.htm | 13 ++- modules/cms/ServiceProvider.php | 2 +- modules/cms/controllers/Index.php | 2 +- modules/cms/controllers/index/_sidepanel.htm | 86 +++++++++++++++---- 5 files changed, 88 insertions(+), 27 deletions(-) diff --git a/modules/backend/classes/NavigationManager.php b/modules/backend/classes/NavigationManager.php index 26b20e1ab..e89d1451e 100644 --- a/modules/backend/classes/NavigationManager.php +++ b/modules/backend/classes/NavigationManager.php @@ -358,6 +358,7 @@ class NavigationManager /** * Specifies a code of the side menu item in the current navigation context. + * If the code is set to TRUE, the first item will be flagged as active. * @param string $sideMenuItemCode Specifies the side menu item code */ public function setContextSideMenu($sideMenuItemCode) @@ -397,6 +398,11 @@ class NavigationManager */ public function isSideMenuItemActive($item) { + if ($this->contextSideMenuItemCode === true) { + $this->contextSideMenuItemCode = null; + return true; + } + return $this->contextOwner == $item->owner && $this->contextSideMenuItemCode == $item->code; } @@ -424,9 +430,9 @@ class NavigationManager { $key = $owner.$mainMenuItemCode; - return array_key_exists($key, $this->contextSidenavPartials) ? - $this->contextSidenavPartials[$key] : - null; + return array_key_exists($key, $this->contextSidenavPartials) + ? $this->contextSidenavPartials[$key] + : null; } /** diff --git a/modules/backend/layouts/_sidenav.htm b/modules/backend/layouts/_sidenav.htm index 636f4e1ce..3f1279820 100644 --- a/modules/backend/layouts/_sidenav.htm +++ b/modules/backend/layouts/_sidenav.htm @@ -2,7 +2,7 @@ $context = BackendMenu::getContext(); $contextSidenav = BackendMenu::getContextSidenavPartial($context->owner, $context->mainMenuCode); - + if (!$contextSidenav): $sideMenuItems = BackendMenu::listSideMenuItems(); if ($sideMenuItems): @@ -11,9 +11,14 @@