pagination in Bootmenu

4 files changed, 27 insertions, 19 deletions

diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index 2c9d2b5..58da07e 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -81,7 +81,7 @@ class user_BootmenuController extends Zend_Controller_Action
 	    }	
 	    
 	    // Pagination
-			$perpage 	= 5;
+			$perpage 	= 2;
 			$req_page 	= $this->_request->getParam('page');
 			$all 		= count($bootmenu);
 			$numpages 	= ceil($all/$perpage);		
@@ -92,7 +92,7 @@ class user_BootmenuController extends Zend_Controller_Action
 			$startitem 	= $req_page * $perpage;		
 		
 			$pagination = new Pbs_Pagination();	
-			$this->view->pagination = $pagination->pagination('/user/client/index',$req_page,$numpages);
+			$this->view->pagination = $pagination->pagination('/user/bootmenu/index',$req_page,$numpages);
 			$this->view->page = $req_page;
 			$this->view->bootmenulist = array_slice($bootmenu,$startitem,$perpage);
 	    	
@@ -109,10 +109,10 @@ class user_BootmenuController extends Zend_Controller_Action
     		$this->_redirect('/user/bootmenu/index/page/'.$this->page.'/addresult/forbidden');
     		    	
         if (!isset($_POST["createbootmenu"])){
-    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu', 'rights' => 'all'));
+    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu', 'rights' => 'all','page' => $this->page));
     	} else {
     			
-    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu', 'rights' => 'all'),$_POST);
+    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu', 'rights' => 'all','page' => $this->page),$_POST);
     			    			
     		if ($bootmenuForm->isValid($_POST)) {
 
@@ -154,11 +154,11 @@ class user_BootmenuController extends Zend_Controller_Action
     		
     	if (!isset($_POST["editbootmenu"])){
 
-    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu', 'rights' => 'all'));
+    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu', 'rights' => 'all','page' => $this->page));
     		$bootmenuForm->populate($bootmenu->toArray()); 
     		
     	}else{
-    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu', 'rights' => 'all'),$_POST);
+    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu', 'rights' => 'all','page' => $this->page),$_POST);
     			    			
     		if ($bootmenuForm->isValid($_POST)) {
 
@@ -225,14 +225,14 @@ class user_BootmenuController extends Zend_Controller_Action
     	$configmapper = new Application_Model_ConfigMapper();
 
     	if (!isset($_POST["addbootmenuentry"])){
-    	    $addbootmenuentryForm = new user_Form_BootmenuEntriesAdd(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()));  
+    	    $addbootmenuentryForm = new user_Form_BootmenuEntriesAdd(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll(),'page' => $this->page));  
     	    $addbootmenuentryForm->populate(array('order' => $this->_request->getParam('maxorder')));
     	    unset($_POST['kcl']);
     	    unset($_POST['configID']);
     	    $addbootmenuentryForm->populate($_POST);
     	} else {
     			
-    	        $addbootmenuentryForm = new user_Form_BootmenuEntriesAdd(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()),$_POST);
+    	        $addbootmenuentryForm = new user_Form_BootmenuEntriesAdd(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll(),'page' => $this->page),$_POST);
     	        
     		    if ($addbootmenuentryForm->isValid($_POST)) {
     		    	
@@ -281,7 +281,7 @@ class user_BootmenuController extends Zend_Controller_Action
     		   	
     		   	$bootmenuentrymapper->find($bootmenuentryID, $bootmenuentry);
     		       		   	
-    		  	$editbootmenuentryForm = new user_Form_BootmenuEntries(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder' => $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll(), 'kcl' => $bootmenuentry->getKcl()));  
+    		  	$editbootmenuentryForm = new user_Form_BootmenuEntries(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder' => $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll(), 'kcl' => $bootmenuentry->getKcl(),'page' => $this->page));  
 
     		  	if(!isset($_POST['configID'])){	
     		  		$editbootmenuentryForm->populate($bootmenuentry->toArray()); 
@@ -293,7 +293,7 @@ class user_BootmenuController extends Zend_Controller_Action
     		  	}
     		}
     	}else{
-    		$editbootmenuentryForm = new user_Form_BootmenuEntries(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll(), 'kcl' => $bootmenuentry->getKcl()),$_POST);
+    		$editbootmenuentryForm = new user_Form_BootmenuEntries(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll(), 'kcl' => $bootmenuentry->getKcl(),'page' => $this->page),$_POST);
     			    			
     		if ($editbootmenuentryForm->isValid($_POST)) {
     			
diff --git a/application/modules/user/forms/Bootmenu.php b/application/modules/user/forms/Bootmenu.php
index 67c76d8..1aaf808 100644
--- a/application/modules/user/forms/Bootmenu.php
+++ b/application/modules/user/forms/Bootmenu.php
@@ -3,7 +3,8 @@
 class user_Form_Bootmenu extends Zend_Form
 {
 	private $action;
-	private $rights;
+	private $rights;	
+	private $page;
 	
     public function setRights($rights){
     	$this->rights = $rights;
@@ -14,10 +15,13 @@ class user_Form_Bootmenu extends Zend_Form
     }
 	
     public function setGrouplist($grouplist){
-    	$this->grouplist = $grouplist;
-    	
+    	$this->grouplist = $grouplist;    	
     }
     
+	public function setPage($page){
+		$this->page = $page;
+	}
+    
     public function init()
     {
         $this->setName($this->action);
@@ -49,7 +53,7 @@ class user_Form_Bootmenu extends Zend_Form
         ));  
         
         $this->addElement('button', 'Cancel', array(
-            'onclick' => 'self.location="/user/bootmenu"'
+            'onclick' => 'self.location="/user/bootmenu/index/page/'.$this->page.'"'
         ));  
 
     }
diff --git a/application/modules/user/forms/BootmenuEntries.php b/application/modules/user/forms/BootmenuEntries.php
index c7463f0..447f09e 100644
--- a/application/modules/user/forms/BootmenuEntries.php
+++ b/application/modules/user/forms/BootmenuEntries.php
@@ -6,7 +6,8 @@ class user_Form_BootmenuEntries extends Zend_Form
 	private $configlist;
 	private $maxorder;
 	private $action;
-	private $rights;
+	private $rights;	
+	private $page;
 	
     public function setRights($rights){
     	$this->rights = $rights;
@@ -26,10 +27,13 @@ class user_Form_BootmenuEntries extends Zend_Form
     }
     
 	public function setConfiglist($configlist){
-    	$this->configlist = $configlist;
-    	
+    	$this->configlist = $configlist;    	
     }
     
+	public function setPage($page){
+		$this->page = $page;
+	}
+    
     
    public function init()
     {
@@ -146,7 +150,7 @@ class user_Form_BootmenuEntries extends Zend_Form
         ));  
         
         $this->addElement('button', 'Cancel', array(
-            'onclick' => 'self.location="/user/bootmenu"'
+            'onclick' => 'self.location="/user/bootmenu/index/page/'.$this->page.'"'
         ));  
 
     }
diff --git a/application/modules/user/views/scripts/bootmenu/index.phtml b/application/modules/user/views/scripts/bootmenu/index.phtml
index dbb7048..72051ab 100644
--- a/application/modules/user/views/scripts/bootmenu/index.phtml
+++ b/application/modules/user/views/scripts/bootmenu/index.phtml
@@ -78,7 +78,7 @@
 						'controller' => 'resource',
 						'action'     => 'getbootmenuentry',
 						'bootmenuentryID'   =>  $bootmenuentry->getID(),
-						'alpha'   =>  $_SESSION['alphasessionID'],,
+						'alpha'   =>  $_SESSION['alphasessionID'],
 						'page'		=> $this->page
 					),
 					'default',