summaryrefslogtreecommitdiffstats
path: root/application/modules/user/controllers
diff options
context:
space:
mode:
authorBjörn Geiger2011-04-05 13:44:30 +0200
committerBjörn Geiger2011-04-05 13:44:30 +0200
commit699bf86b8098eb4d0b2b847ddd692057b11fd7fb (patch)
tree661fed9f69726d43e59e18aea5b02f94d7f23534 /application/modules/user/controllers
parentRights im Personen Controller eingeführt, verwalten von anderen Accounts nun... (diff)
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-699bf86b8098eb4d0b2b847ddd692057b11fd7fb.tar.gz
pbs2-699bf86b8098eb4d0b2b847ddd692057b11fd7fb.tar.xz
pbs2-699bf86b8098eb4d0b2b847ddd692057b11fd7fb.zip
Merge branch 'master' of ssh://git.openslx.org/lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/user/controllers')
-rw-r--r--application/modules/user/controllers/BootisoController.php14
-rw-r--r--application/modules/user/controllers/BootmenuController.php15
-rw-r--r--application/modules/user/controllers/BootosController.php14
-rw-r--r--application/modules/user/controllers/ClientController.php7
-rw-r--r--application/modules/user/controllers/ConfigController.php15
-rw-r--r--application/modules/user/controllers/FilterController.php15
-rw-r--r--application/modules/user/controllers/PoolController.php15
-rw-r--r--application/modules/user/controllers/PrebootController.php15
8 files changed, 107 insertions, 3 deletions
diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php
index a6fbe9e..877cb65 100644
--- a/application/modules/user/controllers/BootisoController.php
+++ b/application/modules/user/controllers/BootisoController.php
@@ -79,6 +79,16 @@ class user_BootisoController extends Zend_Controller_Action
$this->view->bootisolist = array_reverse($this->view->bootisolist);
+ // Search
+ $search = $this->_request->getParam('search');
+ $mySearch = new Pbs_Search();
+ $mySearch->setSearchTerm($search);
+ $mySearch->setModule('bootiso');
+ $this->view->searchform = $mySearch->searchForm();
+ if($search != ''){
+ $this->view->search = $mySearch->getSearchTerm();
+ $this->view->bootisolist = $mySearch->search($this->view->bootisolist);
+ }
// Pagination
$pagination = new Pbs_Pagination();
@@ -105,6 +115,10 @@ class user_BootisoController extends Zend_Controller_Action
}
+ public function searchAction(){
+ $this->_redirect('/user/bootiso/index/search/'.($_GET['search']));
+ }
+
public function downloadbootisoAction()
{
$this->_helper->layout->disableLayout();
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index 7843b3f..dfe9f20 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -88,6 +88,17 @@ class user_BootmenuController extends Zend_Controller_Action
}
}
+ // Search
+ $search = $this->_request->getParam('search');
+ $mySearch = new Pbs_Search();
+ $mySearch->setSearchTerm($search);
+ $mySearch->setModule('bootmenu');
+ $this->view->searchform = $mySearch->searchForm();
+ if($search != ''){
+ $this->view->search = $mySearch->getSearchTerm();
+ $bootmenu = $mySearch->search($bootmenu);
+ }
+
// Pagination
$pagination = new Pbs_Pagination();
$pagination->setPerPage(2);
@@ -103,6 +114,10 @@ class user_BootmenuController extends Zend_Controller_Action
$this->view->bootmenuentrylist = $bootmenuentries;
}
+
+ public function searchAction(){
+ $this->_redirect('/user/bootmenu/index/search/'.($_GET['search']));
+ }
public function createbootmenuAction()
diff --git a/application/modules/user/controllers/BootosController.php b/application/modules/user/controllers/BootosController.php
index 8f602fe..e1b4f7b 100644
--- a/application/modules/user/controllers/BootosController.php
+++ b/application/modules/user/controllers/BootosController.php
@@ -66,6 +66,17 @@ class user_BootosController extends Zend_Controller_Action
$this->view->bootoslist = $this->bootosMapper->findBy(array("groupID" => $groupID));
$this->view->update = array();
+ // Search
+ $search = $this->_request->getParam('search');
+ $mySearch = new Pbs_Search();
+ $mySearch->setSearchTerm($search);
+ $mySearch->setModule('bootos');
+ $this->view->searchform = $mySearch->searchForm();
+ if($search != ''){
+ $this->view->search = $mySearch->getSearchTerm();
+ $this->view->bootoslist = $mySearch->search($this->view->bootoslist);
+ }
+
// Pagination
$pagination = new Pbs_Pagination();
$pagination->setPerPage(5);
@@ -92,6 +103,9 @@ class user_BootosController extends Zend_Controller_Action
}
}
+ public function searchAction(){
+ $this->_redirect('/user/bootos/index/search/'.($_GET['search']));
+ }
public function createbootosAction()
{
diff --git a/application/modules/user/controllers/ClientController.php b/application/modules/user/controllers/ClientController.php
index 87e764d..9fe4b03 100644
--- a/application/modules/user/controllers/ClientController.php
+++ b/application/modules/user/controllers/ClientController.php
@@ -53,15 +53,16 @@ class User_ClientController extends Zend_Controller_Action
$search = $this->_request->getParam('search');
$mySearch = new Pbs_Search();
$mySearch->setSearchTerm($search);
+ $mySearch->setModule('client');
$this->view->searchform = $mySearch->searchForm();
if($search != ''){
- $this->view->search = $search;
+ $this->view->search = $mySearch->getSearchTerm();
$clientsInGroup = $mySearch->search($clientsInGroup);
}
// Pagination
$pagination = new Pbs_Pagination();
- $pagination->setPerPage(10);
+ $pagination->setPerPage(10);
$pagination->setElement($clientsInGroup);
$pagination->setRequestPage($this->_request->getParam('page'));
$pagination->setPageUrl('/user/client/index'.((isset($this->view->search))?'/search/'.$this->view->search:''));
@@ -73,7 +74,7 @@ class User_ClientController extends Zend_Controller_Action
}
public function searchAction(){
- $this->_redirect('/user/client/index/search/'.$_GET['search']);
+ $this->_redirect('/user/client/index/search/'.($_GET['search']));
}
public function addclientAction()
diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php
index 83ff804..4bc2526 100644
--- a/application/modules/user/controllers/ConfigController.php
+++ b/application/modules/user/controllers/ConfigController.php
@@ -66,6 +66,17 @@ class user_ConfigController extends Zend_Controller_Action
$config->setGroupID("[".$config->getGroupID()."] ".$groupMapper->find($config->getGroupID())->getTitle());
}
+ // Search
+ $search = $this->_request->getParam('search');
+ $mySearch = new Pbs_Search();
+ $mySearch->setSearchTerm($search);
+ $mySearch->setModule('config');
+ $this->view->searchform = $mySearch->searchForm();
+ if($search != ''){
+ $this->view->search = $mySearch->getSearchTerm();
+ $this->view->configlist = $mySearch->search($this->view->configlist);
+ }
+
// Pagination
$pagination = new Pbs_Pagination();
$pagination->setPerPage(2);
@@ -79,6 +90,10 @@ class user_ConfigController extends Zend_Controller_Action
$this->view->configlist = $this->view->configlist;
}
+
+ public function searchAction(){
+ $this->_redirect('/user/config/index/search/'.($_GET['search']));
+ }
public function createconfigAction()
{
diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php
index 4ab3ad6..f84f501 100644
--- a/application/modules/user/controllers/FilterController.php
+++ b/application/modules/user/controllers/FilterController.php
@@ -55,6 +55,17 @@ class User_FilterController extends Zend_Controller_Action
$ff->setID($filter['filterID']);
$allFilter[] = $ff;
}
+
+ // Search
+ $search = $this->_request->getParam('search');
+ $mySearch = new Pbs_Search();
+ $mySearch->setSearchTerm($search);
+ $mySearch->setModule('filter');
+ $this->view->searchform = $mySearch->searchForm();
+ if($search != ''){
+ $this->view->search = $mySearch->getSearchTerm();
+ $allFilter = $mySearch->search($allFilter);
+ }
// Pagination
$pagination = new Pbs_Pagination();
@@ -69,6 +80,10 @@ class User_FilterController extends Zend_Controller_Action
$this->view->filters = $allFilter;
}
+
+ public function searchAction(){
+ $this->_redirect('/user/filter/index/search/'.($_GET['search']));
+ }
public function addfilterAction()
{
diff --git a/application/modules/user/controllers/PoolController.php b/application/modules/user/controllers/PoolController.php
index e5fea8c..7800c7a 100644
--- a/application/modules/user/controllers/PoolController.php
+++ b/application/modules/user/controllers/PoolController.php
@@ -64,6 +64,17 @@ class User_PoolController extends Zend_Controller_Action
$ff->setID($pool['poolID']);
$yourpools[] = $ff;
}
+
+ // Search
+ $search = $this->_request->getParam('search');
+ $mySearch = new Pbs_Search();
+ $mySearch->setSearchTerm($search);
+ $mySearch->setModule('pool');
+ $this->view->searchform = $mySearch->searchForm();
+ if($search != ''){
+ $this->view->search = $mySearch->getSearchTerm();
+ $yourpools = $mySearch->search($yourpools);
+ }
// Pagination
$pagination = new Pbs_Pagination();
@@ -95,6 +106,10 @@ class User_PoolController extends Zend_Controller_Action
if(Pbs_Acl::checkRight('posuc'))
$this->view->freeclients = $freeclients;
}
+
+ public function searchAction(){
+ $this->_redirect('/user/pool/index/search/'.($_GET['search']));
+ }
public function createpoolAction()
{
diff --git a/application/modules/user/controllers/PrebootController.php b/application/modules/user/controllers/PrebootController.php
index 6944e27..43cbf8a 100644
--- a/application/modules/user/controllers/PrebootController.php
+++ b/application/modules/user/controllers/PrebootController.php
@@ -64,6 +64,17 @@ class User_PrebootController extends Zend_Controller_Action
$this->view->prebootlist = $this->prebootMapper->findBy(array("groupID" => $groupID));
+ // Search
+ $search = $this->_request->getParam('search');
+ $mySearch = new Pbs_Search();
+ $mySearch->setSearchTerm($search);
+ $mySearch->setModule('preboot');
+ $this->view->searchform = $mySearch->searchForm();
+ if($search != ''){
+ $this->view->search = $mySearch->getSearchTerm();
+ $this->view->prebootlist = $mySearch->search($this->view->prebootlist);
+ }
+
// Pagination
$pagination = new Pbs_Pagination();
$pagination->setPerPage(2);
@@ -89,6 +100,10 @@ class User_PrebootController extends Zend_Controller_Action
}
}
+ public function searchAction(){
+ $this->_redirect('/user/preboot/index/search/'.($_GET['search']));
+ }
+
public function createprebootAction()
{