From b9e04c6ca3e4b11e8cc15e245092c1aa697a77e5 Mon Sep 17 00:00:00 2001 From: Logsol Date: Wed, 6 Nov 2013 13:06:36 +0100 Subject: [PATCH] fixed bug. inactive navigation items were not showing in admin center --- application/controller/AdminNavigationController.php | 2 +- application/model/Navigation.php | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/application/controller/AdminNavigationController.php b/application/controller/AdminNavigationController.php index 7d9254b..dcf0ec3 100644 --- a/application/controller/AdminNavigationController.php +++ b/application/controller/AdminNavigationController.php @@ -10,7 +10,7 @@ class AdminNavigationController extends Katharsis_Controller_Abstract public function indexAction() { - $this->_view->list = $this->_navi->getAllItems(); + $this->_view->list = $this->_navi->getAllItems(false); } public function editAction() diff --git a/application/model/Navigation.php b/application/model/Navigation.php index bf92081..7bfeb1b 100644 --- a/application/model/Navigation.php +++ b/application/model/Navigation.php @@ -5,10 +5,12 @@ class Navigation extends Katharsis_Model_Abstract { } - public function getAllItems() + public function getAllItems($onlyActive = true) { $tidyResult = array(); - $result = $this->_con->fetchAll("SELECT * FROM navigation WHERE parent_id IS NULL AND active = 1 ORDER BY sorting"); + $activityStatement = $onlyActive ? "AND active = 1" : ""; + + $result = $this->_con->fetchAll("SELECT * FROM navigation WHERE parent_id IS NULL " . $activityStatement . " ORDER BY sorting"); foreach($result as $item) { $subSet = array();