diff options
Diffstat (limited to 'application/modules/user')
| -rw-r--r-- | application/modules/user/controllers/SessionController.php | 4 | ||||
| -rw-r--r-- | application/modules/user/layouts/user.phtml | 40 |
2 files changed, 27 insertions, 17 deletions
diff --git a/application/modules/user/controllers/SessionController.php b/application/modules/user/controllers/SessionController.php index b027f63..d149f22 100644 --- a/application/modules/user/controllers/SessionController.php +++ b/application/modules/user/controllers/SessionController.php @@ -76,7 +76,7 @@ class User_SessionController extends Zend_Controller_Action // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(3); + $pagination->setPerPage(10); $pagination->setElement($mySessions); $pagination->setRequestPage($this->_request->getParam('page')); $pagination->setPageUrl('/user/session/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); @@ -87,8 +87,6 @@ class User_SessionController extends Zend_Controller_Action $this->view->sessions = $mySessions; } - - public function searchAction(){ $this->_redirect('/user/session/index/search/'.($_GET['search'])); diff --git a/application/modules/user/layouts/user.phtml b/application/modules/user/layouts/user.phtml index 14ce235..7d80d38 100644 --- a/application/modules/user/layouts/user.phtml +++ b/application/modules/user/layouts/user.phtml @@ -28,20 +28,32 @@ echo $this->headScript()."\n"; <li class='navTreeItem'><a href='/user/'>user</a></li> <li> <ul class='navTreeLevel1'> - <?php if (Zend_Auth::getInstance()->hasIdentity() && count(Zend_Session::namespaceGet('userIDs')) > 0) {?> - <li class='navTreeItem'><a href='/user/person'>Person</a></li> - <li class='navTreeItem'><a href='/user/group'>Group</a></li> - <li class='navTreeItem'><a href='/user/role'>Role</a></li> - <li class='navTreeItem'><a href='/user/bootiso'>BootIso</a></li> - <li class='navTreeItem'><a href='/user/preboot'>PreBoot</a></li> - <li class='navTreeItem'><a href='/user/bootmenu'>BootMenu</a></li> - <li class='navTreeItem'><a href='/user/config'>Config</a></li> - <li class='navTreeItem'><a href='/user/bootos'>BootOs</a></li> - <li class='navTreeItem'><a href='/user/client'>Client</a></li> - <li class='navTreeItem'><a href='/user/filter'>Filter</a></li> - <li class='navTreeItem'><a href='/user/pool'>Pool</a></li> - <li class='navTreeItem'><a href='/user/session'>Session</a></li> - <?php + <?php if (Zend_Auth::getInstance()->hasIdentity() && count(Zend_Session::namespaceGet('userIDs')) > 0) { + # This should be splitted + if(Pbs_Acl::checkRight('pso') || Pbs_Acl::checkRight('psod')) + echo "<li class='navTreeItem'><a href='/user/person'>Person</a></li>"; + if(Pbs_Acl::checkRight('gso')) + echo "<li class='navTreeItem'><a href='/user/group'>Group</a></li>"; + if(Pbs_Acl::checkRight('ro')) + echo "<li class='navTreeItem'><a href='/user/role'>Role</a></li>"; + if(Pbs_Acl::checkRight('bai') || Pbs_Acl::checkRight('bui')) + echo "<li class='navTreeItem'><a href='/user/bootiso'>BootIso</a></li>"; + if(Pbs_Acl::checkRight('pro')) + echo "<li class='navTreeItem'><a href='/user/preboot'>PreBoot</a></li>"; + if(Pbs_Acl::checkRight('booai') || Pbs_Acl::checkRight('booui')) + echo "<li class='navTreeItem'><a href='/user/bootmenu'>BootMenu</a></li>"; + if(Pbs_Acl::checkRight('csai') || Pbs_Acl::checkRight('csui')) + echo "<li class='navTreeItem'><a href='/user/config'>Config</a></li>"; + if(Pbs_Acl::checkRight('boai') || Pbs_Acl::checkRight('boui')) + echo "<li class='navTreeItem'><a href='/user/bootos'>BootOs</a></li>"; + if(Pbs_Acl::checkRight('clo')) + echo "<li class='navTreeItem'><a href='/user/client'>Client</a></li>"; + if(Pbs_Acl::checkRight('fo')) + echo "<li class='navTreeItem'><a href='/user/filter'>Filter</a></li>"; + if(Pbs_Acl::checkRight('poo')) + echo "<li class='navTreeItem'><a href='/user/pool'>Pool</a></li>"; + if(Pbs_Acl::checkRight('so')) + echo "<li class='navTreeItem'><a href='/user/session'>Session</a></li>"; } ?> <?php if (!Zend_Auth::getInstance()->hasIdentity()) {?> |