Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

1 files changed, 33 insertions, 19 deletions

diff --git a/application/modules/user/controllers/PoolController.php b/application/modules/user/controllers/PoolController.php
index ab6a078..5584b85 100644
--- a/application/modules/user/controllers/PoolController.php
+++ b/application/modules/user/controllers/PoolController.php
@@ -62,7 +62,7 @@ class User_PoolController extends Zend_Controller_Action
 			$ff->setID($pool['poolID']);
 			$yourpools[] = $ff;
 		}
-		$perpage 	= 5;
+		$perpage 	= 4;
 		$req_page 	= $this->_request->getParam('page');
 		$all 		= count($yourpools);
 		$numpages 	= ceil($all/$perpage);		
@@ -74,6 +74,7 @@ class User_PoolController extends Zend_Controller_Action
 		
 		$pagination = new Pbs_Pagination();	
 		$this->view->pagination = $pagination->pagination('/user/pool/index',$req_page,$numpages);
+		$this->view->page = $req_page;
 		$this->view->pools = array_slice($yourpools,$startitem,$perpage);
 
 		// Get all Clients from this group
@@ -99,12 +100,16 @@ class User_PoolController extends Zend_Controller_Action
 		// ACL: is he allowed to create a pool?
 		if(!Pbs_Acl::checkRight('poc'))
 			$this->_redirect('/user');
-			
+		
+		$page = $this->_request->getParam('page');
+		
 		if (!isset($_POST["add"])){
-			$addfilterform = new user_Form_Pool(array('buttontext' => 'Create Pool'));
+			$addfilterform = new user_Form_Pool(array('buttontext' => 'Create Pool'));			
+			$addfilterform->setPage($page);
 			$this->view->addpool = $addfilterform;
 		}else {
-			$addpoolform = new user_Form_Pool(array('buttontext' => 'Create Pool'),$_POST);
+			$addpoolform = new user_Form_Pool(array('buttontext' => 'Create Pool'),$_POST);					
+			$addpoolform->setPage($page);
 			if ($addpoolform->isValid($_POST)) {
 				try{
 					$pool = new Application_Model_Pool($_POST);
@@ -124,6 +129,7 @@ class User_PoolController extends Zend_Controller_Action
 	public function deletepoolAction()
 	{
 		$poolID = $this->_request->getParam('poolID');
+		$page = $this->_request->getParam('page');
 		
 		// ACL: is he allowed to delete a pool?
 		if(!Pbs_Acl::checkRight('pod'))
@@ -137,13 +143,13 @@ class User_PoolController extends Zend_Controller_Action
 				$deletepool = new Application_Model_Pool();
 				$deletepool->setID($poolID);
 				$poolmapper->delete($deletepool);
-				$this->_redirect('/user/pool/index/deleteresult/ok');
+				$this->_redirect('/user/pool/index/page/'.$page.'/deleteresult/ok');
 			}
 			else{
-				$this->_redirect('/user/pool/index/deleteresult/forbidden');
+				$this->_redirect('/user/pool/index/page/'.$page.'/deleteresult/forbidden');
 			}
 		}
-		$this->_redirect('/user/pool/index/deleteresult/error');
+		$this->_redirect('/user/pool/index/page/'.$page.'/deleteresult/error');
 	}
 
 	public function editpoolAction()
@@ -152,26 +158,30 @@ class User_PoolController extends Zend_Controller_Action
 		if(!Pbs_Acl::checkRight('poe'))
 			$this->_redirect('/user');
 		
+		$page = $this->_request->getParam('page');
 		if (!isset($_POST["add"])){
-			$poolID = $this->_request->getParam('poolID');
+			$poolID = $this->_request->getParam('poolID');			
 			$pool = new Application_Model_Pool();
 			$poolmapper = new Application_Model_PoolMapper();
 			$poolmapper->find($poolID,$pool);
 			if($pool->getGroupID() == $this->membership->getGroupID()){
 				$poolArray = $pool->toArray();
 				$editpool = new user_Form_Pool(array('buttontext' => 'Edit Pool'));
+				$editpool->setPage($page);
 				$editpool->populate($poolArray);
 				$this->view->editpool = $editpool;
 			}
 			else{
-				$this->_redirect('/user/pool/index/modifyresult/forbidden');
+				$this->_redirect('/user/pool/index/page/'.$page.'/modifyresult/forbidden');
 			}
 		}else {
 			$editpoolform = new user_Form_Pool(array('buttontext' => 'Edit Pool'),$_POST);
+			$editpoolform->setPage($page);
 			if ($editpoolform->isValid($_POST)) {
 				try{
 					$poolmapper = new Application_Model_PoolMapper();
 					$poolID = $this->_request->getParam('poolID');
+					$page = $this->_request->getParam('page');
 					$pooldb = new Application_Model_Pool();
 					$poolmapper->find($poolID,$pooldb);
 					print_a($pooldb->getGroupID(), $this->membership->getGroupID());
@@ -180,14 +190,14 @@ class User_PoolController extends Zend_Controller_Action
 						$pool->setID($poolID);
 						$pool->setGroupID($this->membership->getGroupID());
 						$poolmapper->save($pool);
-						$this->_redirect('/user/pool/index/modifyresult/ok');
+						$this->_redirect('/user/pool/index/page/'.$page.'/modifyresult/ok');
 					}
 					else{
-						$this->_redirect('/user/pool/index/modifyresult/forbidden');
+						$this->_redirect('/user/pool/index/page/'.$page.'/modifyresult/forbidden');
 					}
 				}catch (Zend_Exception $e) {
 					echo "Error message 2: " . $e->getMessage() . "\n";
-					$this->_redirect('/user/pool/index/modifyresult/error');
+					$this->_redirect('/user/pool/index/page/'.$page.'/modifyresult/error');
 				}
 			}
 			$this->view->editpool = $editpoolform;
@@ -198,6 +208,7 @@ class User_PoolController extends Zend_Controller_Action
 	{
 		$clientID = $this->_request->getParam('clientID');
 		$poolID = $this->_request->getParam('poolID');
+		$page = $this->_request->getParam('page');
 
 		// ACL: Is he allowed to link clients to pools?
 		if(!Pbs_Acl::checkRight('polc'))
@@ -214,9 +225,11 @@ class User_PoolController extends Zend_Controller_Action
 			$freeclients  = $this->arrayDiff($clients,$assignedclientsArray);
 
 			$poolclient = new user_Form_PoolClient(array('buttontext' => 'Link Client','clients'=> $freeclients));
+			$poolclient->setPage($page);
 			$this->view->poolclient = $poolclient;
 		}else {
-			$poolclient = new dev_Form_PoolClient(array('buttontext' => 'Link Client'),$_POST);
+			$poolclient = new user_Form_PoolClient(array('buttontext' => 'Link Client'),$_POST);
+			$poolclient->setPage($page);
 			try{
 				$poolID = $this->_request->getParam('poolID');
 				$poolmapper = new Application_Model_PoolMapper();
@@ -234,14 +247,14 @@ class User_PoolController extends Zend_Controller_Action
 						$poolentry->setClientID($clientID);
 					}
 					$poolentriesmapper->save($poolentry);
-					$this->_redirect('/user/pool/index/linkresult/ok');
+					$this->_redirect('/user/pool/index/page/'.$page.'/linkresult/ok');
 				}
 				else{
-					$this->_redirect('/user/pool/index/linkresult/forbidden');
+					$this->_redirect('/user/pool/index/page/'.$page.'/linkresult/forbidden');
 				}
 			}catch (Zend_Exception $e) {
 				echo "Error message 2: " . $e->getMessage() . "\n";
-				$this->_redirect('/user/pool/index/linkresult/error');
+				$this->_redirect('/user/pool/index/page/'.$page.'/linkresult/error');
 			}
 			$this->view->poolclient = $poolclient;
 		}
@@ -250,6 +263,7 @@ class User_PoolController extends Zend_Controller_Action
 	public function unlinkclientAction()
 	{
 		$poolentriesID = $this->_request->getParam('poolentriesID');
+		$page = $this->_request->getParam('page');
 			
 		// ACL: Is he allowed to unlink clients from pools?
 		if(!Pbs_Acl::checkRight('pouc'))
@@ -274,14 +288,14 @@ class User_PoolController extends Zend_Controller_Action
 				$deletepoolentries->setID($poolentriesID);
 				$deletepoolentriesmapper = new Application_Model_PoolEntriesMapper();
 				$deletepoolentriesmapper->delete($deletepoolentries);
-				$this->_redirect('/user/pool/index/unlinkresult/ok');
+				$this->_redirect('/user/pool/index/page/'.$page.'/unlinkresult/ok');
 			}
 			else{
-				$this->_redirect('/user/pool/index/unlinkresult/forbidden');
+				$this->_redirect('/user/pool/index/page/'.$page.'/unlinkresult/forbidden');
 			}
 		}
 		else{
-			$this->_redirect('/user/pool/index/unlinkresult/error');
+			$this->_redirect('/user/pool/index/page/'.$page.'/unlinkresult/error');
 		}
 	}