diff options
Diffstat (limited to 'application/modules')
-rw-r--r-- | application/modules/user/controllers/FilterController.php | 3 | ||||
-rw-r--r-- | application/modules/user/forms/Filter.php | 13 |
2 files changed, 9 insertions, 7 deletions
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php index f9a4724..ae91b4e 100644 --- a/application/modules/user/controllers/FilterController.php +++ b/application/modules/user/controllers/FilterController.php @@ -107,8 +107,6 @@ class User_FilterController extends Zend_Controller_Action $bmmapper = new Application_Model_BootMenuMapper(); $result = $bmmapper->findBy(array('groupID' => $this->membership->getGroupID()),true); - print_a($result); - foreach($result as $rr){ $bm = new Application_Model_BootMenu(); @@ -143,7 +141,6 @@ class User_FilterController extends Zend_Controller_Action $filterentry = new Application_Model_FilterEntries(); $filterentry->setFilterID($id); $filterentry->setFiltertypeID(6); - $filterentry->setCreated(time()); $filterentry->setFiltervalue($this->membership->getGroupID()); $filterentriesMapper->save($filterentry); diff --git a/application/modules/user/forms/Filter.php b/application/modules/user/forms/Filter.php index 81d9e15..5eabd60 100644 --- a/application/modules/user/forms/Filter.php +++ b/application/modules/user/forms/Filter.php @@ -18,13 +18,18 @@ class user_Form_Filter extends Zend_Form public function init() { $this->setName("Add Filter"); - $this->setMethod('post'); + $this->setMethod('post'); - if(Pbs_Acl::checkRight('fefp') || Pbs_Acl::checkRight('fa')){ - $edit = 'true'; + if(stristr($_SERVER['REQUEST_URI'],'addfilter')){ + $edit = null; } else{ - $edit = null; + if(!Pbs_Acl::checkRight('fe') && Pbs_Acl::checkRight('fefp') ){ + $edit = 'true'; + } + else{ + $edit = null; + } } $this->addElement('text', 'title', array( |