diff options
author | Björn Geiger | 2011-04-13 15:05:57 +0200 |
---|---|---|
committer | Björn Geiger | 2011-04-13 15:05:57 +0200 |
commit | 613767d825c2e82d7f35947f4a864f09f27dab2b (patch) | |
tree | 6bdd7d1f9b4f830ae6e24881ad575d0a374b46f7 | |
parent | Suspend und Resume Account (diff) | |
parent | Anzahl der Einträge in Listen überall auf 10 gesetzt (diff) | |
download | pbs2-613767d825c2e82d7f35947f4a864f09f27dab2b.tar.gz pbs2-613767d825c2e82d7f35947f4a864f09f27dab2b.tar.xz pbs2-613767d825c2e82d7f35947f4a864f09f27dab2b.zip |
Merge branch 'master' of ssh://git.openslx.org/lsfks/master-teamprojekt/pbs2
11 files changed, 22 insertions, 22 deletions
diff --git a/application/modules/user/controllers/BootisoController.php b/application/modules/user/controllers/BootisoController.php index b928a19..f0770e1 100644 --- a/application/modules/user/controllers/BootisoController.php +++ b/application/modules/user/controllers/BootisoController.php @@ -101,13 +101,13 @@ class user_BootisoController extends Zend_Controller_Action // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(2); + $pagination->setPerPage(10); $pagination->setElement($this->view->bootisolist); $pagination->setRequestPage($this->_request->getParam('page')); $pagination->setPageUrl('/user/bootiso/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); $this->view->bootisolist = $pagination->getElements(); - $this->view->pagination = $pagination->pagination($pageurl); + $this->view->pagination = $pagination->pagination(); $this->view->page = $pagination->getRequestPage(); } diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php index 5082aaf..b03888e 100644 --- a/application/modules/user/controllers/BootmenuController.php +++ b/application/modules/user/controllers/BootmenuController.php @@ -123,7 +123,7 @@ class user_BootmenuController extends Zend_Controller_Action // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(3); + $pagination->setPerPage(10); $pagination->setElement($bootmenu); $pagination->setRequestPage($this->_request->getParam('page')); $pagination->setPageUrl('/user/bootmenu/index/type/'.$this->type.((isset($this->view->search))?'/search/'.$this->view->search:'')); diff --git a/application/modules/user/controllers/BootosController.php b/application/modules/user/controllers/BootosController.php index df2d7fd..2fe8f41 100644 --- a/application/modules/user/controllers/BootosController.php +++ b/application/modules/user/controllers/BootosController.php @@ -106,13 +106,13 @@ class user_BootosController extends Zend_Controller_Action // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(5); + $pagination->setPerPage(10); $pagination->setElement($this->view->bootoslist); $pagination->setRequestPage($this->_request->getParam('page')); $pagination->setPageUrl('/user/bootos/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); $this->view->bootoslist = $pagination->getElements(); - $this->view->pagination = $pagination->pagination($pageurl); + $this->view->pagination = $pagination->pagination(); $this->view->page = $pagination->getRequestPage(); diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php index 2491c0e..a835b31 100644 --- a/application/modules/user/controllers/ConfigController.php +++ b/application/modules/user/controllers/ConfigController.php @@ -85,13 +85,13 @@ class user_ConfigController extends Zend_Controller_Action // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(4); + $pagination->setPerPage(10); $pagination->setElement($this->view->configlist); $pagination->setRequestPage($this->_request->getParam('page')); $pagination->setPageUrl('/user/config/index/type/'.$this->type.((isset($this->view->search))?'/search/'.$this->view->search:'')); $this->view->configlist = $pagination->getElements(); - $this->view->pagination = $pagination->pagination($pageurl); + $this->view->pagination = $pagination->pagination(); $this->view->page = $pagination->getRequestPage(); } diff --git a/application/modules/user/controllers/FilterController.php b/application/modules/user/controllers/FilterController.php index a65aba5..0d9ea05 100644 --- a/application/modules/user/controllers/FilterController.php +++ b/application/modules/user/controllers/FilterController.php @@ -72,13 +72,13 @@ class User_FilterController extends Zend_Controller_Action // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(5); + $pagination->setPerPage(10); $pagination->setElement($allFilter); $pagination->setRequestPage($this->_request->getParam('page')); $pagination->setPageUrl('/user/filter/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); $allFilter = $pagination->getElements(); - $this->view->pagination = $pagination->pagination($pageurl); + $this->view->pagination = $pagination->pagination(); $this->view->page = $pagination->getRequestPage(); $this->view->filters = $allFilter; diff --git a/application/modules/user/controllers/GroupController.php b/application/modules/user/controllers/GroupController.php index d9fd368..9a5380a 100644 --- a/application/modules/user/controllers/GroupController.php +++ b/application/modules/user/controllers/GroupController.php @@ -55,13 +55,13 @@ class User_GroupController extends Zend_Controller_Action // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(5); + $pagination->setPerPage(10); $pagination->setElement($this->view->groupList); $pagination->setRequestPage($this->_request->getParam('page')); $pagination->setPageUrl('/user/group/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); $this->view->groupList = $pagination->getElements(); - $this->view->pagination = $pagination->pagination($pageurl); + $this->view->pagination = $pagination->pagination(); $this->view->page = $pagination->getRequestPage(); $this->view->userIDsNamespace = $this->userIDsNamespace; } @@ -246,7 +246,7 @@ class User_GroupController extends Zend_Controller_Action if(is_array($membersList)) { // Member Pagination $memberPagination = new Pbs_Pagination(); - $memberPagination->setPerPage(5); + $memberPagination->setPerPage(10); $memberPagination->setElement($membersList); $memberPagination->setRequestPage($this->_request->getParam('page')); if($this->_request->getParam('groupID')) { diff --git a/application/modules/user/controllers/PersonController.php b/application/modules/user/controllers/PersonController.php index 975b10e..25b1f0a 100644 --- a/application/modules/user/controllers/PersonController.php +++ b/application/modules/user/controllers/PersonController.php @@ -81,7 +81,7 @@ class user_PersonController extends Zend_Controller_Action // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(5); + $pagination->setPerPage(10); $pagination->setElement($this->view->personList); $pagination->setRequestPage($this->_request->getParam('page')); $pagination->setPageUrl('/user/person/index/'.((isset($this->view->search))?'/search/'.$this->view->search:'')); @@ -112,7 +112,7 @@ class user_PersonController extends Zend_Controller_Action } // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(3); + $pagination->setPerPage(10); $pagination->setElement($this->groups); $pagination->setRequestPage($this->_request->getParam('page')); $pagination->setPageUrl('/user/person/index' .((isset($this->view->search))?'/search/'.$this->view->search:'')); @@ -377,7 +377,7 @@ class user_PersonController extends Zend_Controller_Action } // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(2); + $pagination->setPerPage(10); $pagination->setElement($groups); $pagination->setRequestPage($this->_request->getParam('page')); $pagination->setPageUrl('/user/person/show/personID/' . $personID .((isset($this->view->search))?'/search/'.$this->view->search:'')); diff --git a/application/modules/user/controllers/PoolController.php b/application/modules/user/controllers/PoolController.php index 942f988..5c137a3 100644 --- a/application/modules/user/controllers/PoolController.php +++ b/application/modules/user/controllers/PoolController.php @@ -78,13 +78,13 @@ class User_PoolController extends Zend_Controller_Action // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(4); + $pagination->setPerPage(10); $pagination->setElement($yourpools); $pagination->setRequestPage($this->_request->getParam('page')); $pagination->setPageUrl('/user/pool/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); $yourpools = $pagination->getElements(); - $this->view->pagination = $pagination->pagination($pageurl); + $this->view->pagination = $pagination->pagination(); $this->view->page = $pagination->getRequestPage(); $this->view->pools = $yourpools; diff --git a/application/modules/user/controllers/PrebootController.php b/application/modules/user/controllers/PrebootController.php index 2aeafda..2e46b59 100644 --- a/application/modules/user/controllers/PrebootController.php +++ b/application/modules/user/controllers/PrebootController.php @@ -74,13 +74,13 @@ class User_PrebootController extends Zend_Controller_Action // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(2); + $pagination->setPerPage(10); $pagination->setElement($this->view->prebootlist); $pagination->setRequestPage($this->_request->getParam('page')); $pagination->setPageUrl('/user/preboot/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); $this->view->prebootlist = $pagination->getElements(); - $this->view->pagination = $pagination->pagination($pageurl); + $this->view->pagination = $pagination->pagination(); $this->view->page = $pagination->getRequestPage(); $this->view->update = array(); diff --git a/application/modules/user/controllers/RoleController.php b/application/modules/user/controllers/RoleController.php index 1b2e54f..2c22031 100644 --- a/application/modules/user/controllers/RoleController.php +++ b/application/modules/user/controllers/RoleController.php @@ -41,13 +41,13 @@ class User_RoleController extends Zend_Controller_Action // Pagination $pagination = new Pbs_Pagination(); - $pagination->setPerPage(5); + $pagination->setPerPage(10); $pagination->setElement($this->view->roleList); $pagination->setRequestPage($this->_request->getParam('page')); $pagination->setPageUrl('/user/role/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); $this->view->roleList = $pagination->getElements(); - $this->view->pagination = $pagination->pagination($pageurl); + $this->view->pagination = $pagination->pagination(); $this->view->page = $pagination->getRequestPage(); $this->view->addRight = Pbs_Acl::checkRight('ra'); $this->view->editRight = Pbs_Acl::checkRight('re'); diff --git a/application/modules/user/controllers/SessionController.php b/application/modules/user/controllers/SessionController.php index c00d759..e17dbfe 100644 --- a/application/modules/user/controllers/SessionController.php +++ b/application/modules/user/controllers/SessionController.php @@ -94,7 +94,7 @@ class User_SessionController extends Zend_Controller_Action $pagination->setPageUrl('/user/session/index'.((isset($this->view->search))?'/search/'.$this->view->search:'')); $mySessions = $pagination->getElements(); - $this->view->pagination = $pagination->pagination($pageurl); + $this->view->pagination = $pagination->pagination(); $this->view->page = $pagination->getRequestPage(); $this->view->sessions = $mySessions; |