summaryrefslogtreecommitdiffstats
path: root/application/controllers/FilterController.php
diff options
context:
space:
mode:
authormichael pereira2011-03-07 17:54:01 +0100
committermichael pereira2011-03-07 17:54:01 +0100
commitf122bafccf6a81b87d982956f615e70ceaecfeb3 (patch)
tree98e9960b2fda10f29765d3382d7fd92cfc100f92 /application/controllers/FilterController.php
parentBootMenuEntries fertig (diff)
parentdirty hack entfertn durch findBy-Methode (diff)
downloadpbs2-f122bafccf6a81b87d982956f615e70ceaecfeb3.tar.gz
pbs2-f122bafccf6a81b87d982956f615e70ceaecfeb3.tar.xz
pbs2-f122bafccf6a81b87d982956f615e70ceaecfeb3.zip
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/controllers/FilterController.php')
-rw-r--r--application/controllers/FilterController.php15
1 files changed, 8 insertions, 7 deletions
diff --git a/application/controllers/FilterController.php b/application/controllers/FilterController.php
index 1305689..73b087c 100644
--- a/application/controllers/FilterController.php
+++ b/application/controllers/FilterController.php
@@ -20,11 +20,6 @@ class FilterController extends Zend_Controller_Action
try{
$this->_filtermapper = new Application_Model_FilterMapper();
$this->view->filters = $this->_filtermapper->fetchAll();
-
- $filterentries = new Application_Model_FilterEntriesMapper();
-
- $this->view->filterentries = $filterentries->fetchAll();
-
}catch (Zend_Exception $e) {
echo "Error message 2: " . $e->getMessage() . "\n";
}
@@ -309,6 +304,12 @@ class FilterController extends Zend_Controller_Action
If client comes from a specific pool
*/
#########################################################
+ // ClientID
+ $filtertypID = 8;
+ /*
+ If client is a specific client
+ */
+ #########################################################
// BootIso
$filtertypID = 4;
/*
@@ -318,13 +319,13 @@ class FilterController extends Zend_Controller_Action
// Membership
$filtertypID = 5;
/*
-
+ user is in a defined membership
*/
#########################################################
// Group
$filtertypID = 6;
/*
-
+ user is in a defined groupID
*/
#########################################################
// Time