diff options
author | Björn Geiger | 2011-04-05 13:44:30 +0200 |
---|---|---|
committer | Björn Geiger | 2011-04-05 13:44:30 +0200 |
commit | 699bf86b8098eb4d0b2b847ddd692057b11fd7fb (patch) | |
tree | 661fed9f69726d43e59e18aea5b02f94d7f23534 /application/modules | |
parent | Rights im Personen Controller eingeführt, verwalten von anderen Accounts nun... (diff) | |
parent | Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff) | |
download | pbs2-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')
17 files changed, 160 insertions, 49 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() { diff --git a/application/modules/user/forms/Filter.php b/application/modules/user/forms/Filter.php index 0676ba8..76cf3f8 100644 --- a/application/modules/user/forms/Filter.php +++ b/application/modules/user/forms/Filter.php @@ -10,7 +10,7 @@ class user_Form_Filter extends Zend_Form $this->setName("Add Filter"); $this->setMethod('post'); - if(Pbs_Acl::checkRight('fefp')){ + if(Pbs_Acl::checkRight('fefp') || Pbs_Acl::checkRight('fa')){ $edit = 'true'; } else{ diff --git a/application/modules/user/views/scripts/bootiso/index.phtml b/application/modules/user/views/scripts/bootiso/index.phtml index f43949d..23f7780 100644 --- a/application/modules/user/views/scripts/bootiso/index.phtml +++ b/application/modules/user/views/scripts/bootiso/index.phtml @@ -1,19 +1,20 @@ <h1>BootMedien</h1> <?php if($this->notification != ''){echo $this->notification;} ?> +<?php echo $this->searchform; ?> <?php echo $this->formButton('createbootiso', 'Create BootISO', array( 'onclick' => 'self.location="/user/bootiso/createbootiso/page/'.$this->page.'"', 'class' => 'addbutton'))?> <table> <tr> - <th>ID</th> - <th>Title</th> - <th>GroupID</th> - <th>MembershipID</th> - <th>PrebootID</th> - <th>Serialnumber</th> - <th>Created</th> - <th>Expires</th> - <th>Public</th> + <th>ID <span class='code'>bootosID</span></th> + <th>Title <span class='code'>title</span></th> + <th>GroupID <span class='code'>groupID</span></th> + <th>MembershipID <span class='code'>membershipID</span></th> + <th>PrebootID <span class='code'>prebootID</span></th> + <th>Serialnumber <span class='code'>serialnumber</span></th> + <th>Created <span class='code'>created</span></th> + <th>Expires <span class='code'>expires</span></th> + <th>Public <span class='code'>public</span></th> <th colspan=3>Actions</th> </tr> <?php if(count($this->bootisolist)==0) diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml index a43a058..b580237 100644 --- a/application/modules/user/views/scripts/bootmenu/index.phtml +++ b/application/modules/user/views/scripts/bootmenu/index.phtml @@ -1,14 +1,15 @@ <h1>BootMenu</h1> <?php if($this->notification != ''){echo $this->notification;} ?> +<?php echo $this->searchform; ?> <?php echo $this->formButton('createbootmenu', 'Create BootMenu', array( 'onclick' => 'self.location="/user/bootmenu/createbootmenu/page/'.$this->page.'"', 'class' => 'addbutton'))?> <table> <tr> - <th>ID</th> - <th>Title</th> - <th>Changed</th> + <th>ID <span class='code'>bootmenuID</span></th> + <th>Title <span class='code'>title</span></th> + <th>Changed <span class='code'>created</span></th> <th colspan=3>Actions</th> </tr> <?php if(count($this->bootmenulist)==0) diff --git a/application/modules/user/views/scripts/bootos/index.phtml b/application/modules/user/views/scripts/bootos/index.phtml index 8982fb2..a678cef 100644 --- a/application/modules/user/views/scripts/bootos/index.phtml +++ b/application/modules/user/views/scripts/bootos/index.phtml @@ -1,5 +1,6 @@ <h1>BootOS</h1> <?php if($this->notification != ''){echo $this->notification;} ?> +<?php echo $this->searchform; ?> <?php echo $this->formButton('checkupdate', 'Check for Updates', array( 'onclick' => 'self.location="/user/bootos/index/page/'.$this->page.'/checkupdate/true"', 'class' => 'updatebutton', @@ -10,18 +11,18 @@ <table> <tr> - <th>ID</th> - <th>Title</th> - <th>GroupID</th> - <th>MembershipID</th> - <th>ConfigID</th> - <th>Init</th> - <th>Kernel</th> - <th>Kcl</th> - <th>Description</th> - <th>Changed</th> - <th>Expires</th> - <th>Public</th> + <th>ID <span class='code'>bootosID</span></th> + <th>Title <span class='code'>title</span></th> + <th>GroupID <span class='code'>groupID</span></th> + <th>MembershipID <span class='code'>membershipID</span></th> + <th>ConfigID <span class='code'>configID</span></th> + <th>Init <span class='code'>init</span></th> + <th>Kernel <span class='code'>kernel</span></th> + <th>Kcl <span class='code'>kcl</span></th> + <th>Description <span class='code'>description</span></th> + <th>Changed <span class='code'>Changed</span></th> + <th>Expires <span class='code'>expires</span></th> + <th>Public <span class='code'>public</span></th> <th colspan=3>Actions</th> </tr> <?php if(count($this->bootoslist)==0) diff --git a/application/modules/user/views/scripts/client/index.phtml b/application/modules/user/views/scripts/client/index.phtml index 051ea90..95bf7a2 100644 --- a/application/modules/user/views/scripts/client/index.phtml +++ b/application/modules/user/views/scripts/client/index.phtml @@ -8,8 +8,8 @@ <?php if ($this->clients): ?> <table> <tr> - <th>MAC<span class='code'> [macadress]</span></th> - <th>Hardwarehash<span class='code'> [hardwarehash]</span></th> + <th>MAC <span class='code'>macadress</span></th> + <th>Hardwarehash <span class='code'>hardwarehash</span></th> <th colspan=2>Actions</th> </tr> <?php foreach ($this->clients as $client): ?> diff --git a/application/modules/user/views/scripts/config/index.phtml b/application/modules/user/views/scripts/config/index.phtml index 478a12d..91177f4 100644 --- a/application/modules/user/views/scripts/config/index.phtml +++ b/application/modules/user/views/scripts/config/index.phtml @@ -1,16 +1,17 @@ <h1>Config</h1> <?php if($this->notification != ''){echo $this->notification;} ?> +<?php echo $this->searchform; ?> <?php echo $this->formButton('createconfig', 'Create Config', array( 'onclick' => 'self.location="/user/config/createconfig/page/'.$this->page.'"', 'class' => 'addbutton'))?> <table> <tr> - <th>ID</th> - <th>Title</th> - <th>GroupID</th> - <th>Shellscript</th> - <th>Changed</th> + <th>ID <span class='code'>configID</span></th> + <th>Title <span class='code'>title</span></th> + <th>GroupID <span class='code'>groupID</span></th> + <th>Shellscript <span class='code'>shellscript</span></th> + <th>Changed <span class='code'>created</span></th> <th colspan=2>Actions</th> </tr> <?php if(count($this->configlist)==0) diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml index 9800d42..7f8bad8 100644 --- a/application/modules/user/views/scripts/filter/index.phtml +++ b/application/modules/user/views/scripts/filter/index.phtml @@ -1,5 +1,6 @@ <h1>Filters</h1> <?php if($this->notification != ''){echo $this->notification;} ?> +<?php echo $this->searchform; ?> <?php echo $this->formButton('createconfig', 'Create Filter', array( 'onclick' => 'self.location="/user/filter/addfilter/page/'.$this->page.'"', 'class' => 'addbutton'))?> @@ -7,11 +8,11 @@ <?php if ($this->filters): ?> <table> <tr> - <th>ID</th> - <th>Title</th> - <th>Description</th> - <th>Priority</th> - <th>TargetBootMenu</th> + <th>ID <span class='code'>filterID</span></th> + <th>Title <span class='code'>title</span></th> + <th>Description <span class='code'>description</span></th> + <th>Priority <span class='code'>priority</span></th> + <th>TargetBootMenu <span class='code'>bootmenuID</span></th> <th colspan=3>Actions</th> </tr> <?php foreach ($this->filters as $filter): ?> diff --git a/application/modules/user/views/scripts/pool/index.phtml b/application/modules/user/views/scripts/pool/index.phtml index 80053f2..f7d04e2 100644 --- a/application/modules/user/views/scripts/pool/index.phtml +++ b/application/modules/user/views/scripts/pool/index.phtml @@ -1,5 +1,6 @@ <h1>Pools</h1> <?php if($this->notification != ''){echo $this->notification;} ?> +<?php echo $this->searchform; ?> <?php echo $this->formButton('createconfig', 'Create Pool', array( 'onclick' => 'self.location="/user/pool/createpool/page/'.$this->page.'"', 'class' => 'addbutton'))?> @@ -7,10 +8,10 @@ <?php if ($this->pools): ?> <table > <tr> - <!--<th>ID</th>--> - <th>Title</th> - <th>Description</th> - <th>Location</th> + <!--<th>ID <span class='code'>poolID</span></th>--> + <th>Title <span class='code'>title</span></th> + <th>Description <span class='code'>description</span></th> + <th>Location <span class='code'>location</span></th> <th colspan=3>Actions</th> </tr> <?php foreach ($this->pools as $pool): ?> diff --git a/application/modules/user/views/scripts/preboot/index.phtml b/application/modules/user/views/scripts/preboot/index.phtml index 9e73de1..295f1ca 100644 --- a/application/modules/user/views/scripts/preboot/index.phtml +++ b/application/modules/user/views/scripts/preboot/index.phtml @@ -1,5 +1,6 @@ <h1>Preboot</h1> <?php if($this->notification != ''){echo $this->notification;} ?> +<?php echo $this->searchform; ?> <?php echo $this->formButton('checkupdate', 'Check for Updates', array( 'onclick' => 'self.location="/user/preboot/index/checkupdate/true"', 'class' => 'updatebutton', @@ -9,11 +10,11 @@ 'class' => 'addbutton'))?> <table> <tr> - <th>ID</th> - <th>Title</th> - <th>GroupID</th> - <th>MembershipID</th> - <th>Preboot Path</th> + <th>ID <span class='code'>prebootID</span></th> + <th>Title <span class='code'>title</span></th> + <th>GroupID <span class='code'>groupID</span></th> + <th>MembershipID <span class='code'>membershipID</span></th> + <th>Preboot Path <span class='code'>path_preboot</span></th> <th colspan=3>Actions</th> </tr> <?php if(count($this->prebootlist)==0) |