Pagination in ettlichen Controllern + aufgeräumt

7 files changed, 78 insertions, 77 deletions

diff --git a/application/modules/user/forms/Bootiso.php b/application/modules/user/forms/Bootiso.php
index d080ac2..1facf94 100644
--- a/application/modules/user/forms/Bootiso.php
+++ b/application/modules/user/forms/Bootiso.php
@@ -7,7 +7,7 @@ class user_Form_Bootiso extends Zend_Form
 	private $groupdepth;
 	private $action;
 	private $rights;
-    private $page;
+	private $page;
 	
     public function setRights($rights){
     	$this->rights = $rights;
@@ -21,10 +21,9 @@ class user_Form_Bootiso extends Zend_Form
     public function setGroupdepth($groupdepth){
     	$this->groupdepth = $groupdepth;	
     }
-	public function setPage($page){
-		$this->page = $page;
-	}
-    
+    public function setPage($p){
+    	$this->page = $p;	
+    }    
 	
     public function init()
     {
@@ -112,12 +111,8 @@ class user_Form_Bootiso extends Zend_Form
         ));  
         
         $this->addElement('button', 'Cancel', array(
-            'onclick' => 'self.location="/user/bootiso/page/'.$this->page.'"'
-        ));  
-        
-        $this->addElement('hidden','page', array(
-        	'value' => $this->page
-        ));
+            'onclick' => 'self.location="/user/bootiso/index/page/'.$this->page.'"'
+        )); 
         ?>
         
         <script>
diff --git a/application/modules/user/forms/Bootos.php b/application/modules/user/forms/Bootos.php
index 3e45f05..867cfc1 100644
--- a/application/modules/user/forms/Bootos.php
+++ b/application/modules/user/forms/Bootos.php
@@ -142,9 +142,9 @@ class user_Form_Bootos extends Zend_Form
             'label'    => $label,
         ));  
         
-        $this->addElement('button', 'Cancel', array(
-            'onclick' => 'self.location="/user/bootos/page/'.$this->page.'"'
-        ));  
+		$this->addElement('button', 'Cancel', array(
+			'onclick' => 'self.location="/user/bootos/index/page/'.$this->page.'"'
+		));  
 
         ?>
 
diff --git a/application/modules/user/forms/Client.php b/application/modules/user/forms/Client.php
index aa8d478..9814583 100644
--- a/application/modules/user/forms/Client.php
+++ b/application/modules/user/forms/Client.php
@@ -3,6 +3,17 @@
 class user_Form_Client extends Zend_Form
 {
 
+	private $buttontext = 'Save';
+	private $groups;
+	private $page;
+	
+	public function setButtontext($v){
+		$this->buttontext = $v;
+	}
+	public function setPage($page){
+		$this->page = $page;
+	}
+	
     public function init()
     {
         $this->setName("pool");
@@ -48,20 +59,6 @@ class user_Form_Client extends Zend_Form
             'onclick' => 'self.location="/user/client/index/page/'.$this->page.'"'
         ));
         
-        $this->addElement('hidden','page', array(
-        	'value' => $this->page
-        ));
     }
-	private $buttontext = 'Save';
-	private $groups;
-	function setButtontext($v){
-		$this->buttontext = $v;
-	}
-	private $page;
-	function setPage($page){
-		$this->page = $page;
-	}
-
-
 }
 
diff --git a/application/modules/user/forms/FilterEntry.php b/application/modules/user/forms/FilterEntry.php
index 33453d7..3fe1aa7 100644
--- a/application/modules/user/forms/FilterEntry.php
+++ b/application/modules/user/forms/FilterEntry.php
@@ -3,7 +3,27 @@
 class user_Form_FilterEntry extends Zend_Form
 {
 
-   private $filterID = 0;
+	private $filterID = 0;
+	private $data ;
+	private $buttontext = 'Save';
+	private $selectData;
+	private $page;   
+
+	public function setButtontext($v){
+		$this->buttontext = $v;
+	}
+	public function setData($v){
+		$this->data = $v;
+	}
+	public function setFilterID($v){
+		$this->filterID = $v;
+	}
+	public function setSelectData($v){
+		$this->selectData = $v;
+	}
+	public function setPage($page){
+		$this->page = $page;
+	}
 
     public function init()
     {
@@ -151,6 +171,7 @@ class user_Form_FilterEntry extends Zend_Form
 					}       
 				}
 				$filtervalue1->setRegisterInArrayValidator(false);
+			
 				break;
 			case "5":
 				$desc = "Select a Membership";
@@ -339,26 +360,6 @@ class user_Form_FilterEntry extends Zend_Form
 		
 	
     }
-
-	private $buttontext = 'Save';
-	function setButtontext($v){
-		$this->buttontext = $v;
-	}
-	private $data ;
-	function setData($v){
-		$this->data = $v;
-	}
-	function setFilterID($v){
-		$this->filterID = $v;
-	}
-	private $selectData;
-	function setSelectData($v){
-		$this->selectData = $v;
-	}
-	private $page;
-	function setPage($page){
-		$this->page = $page;
-	}
 }
 
 ?>
diff --git a/application/modules/user/forms/Pool.php b/application/modules/user/forms/Pool.php
index 055d0a7..be2f6c6 100644
--- a/application/modules/user/forms/Pool.php
+++ b/application/modules/user/forms/Pool.php
@@ -2,6 +2,15 @@
 
 class user_Form_Pool extends Zend_Form
 {
+	private $buttontext = 'Save';
+	private $page;
+	
+	public function setButtontext($v){
+		$this->buttontext = $v;
+	}	
+	public function setPage($page){
+		$this->page = $page;
+	}
 
     public function init()
     {
@@ -24,9 +33,8 @@ class user_Form_Pool extends Zend_Form
 			'required' => false,
 			'label' => 'Description:',
 		));
-		// TODO: Add target of Filter
 
-		 $this->addElement('text', 'location', array(
+		$this->addElement('text', 'location', array(
 			'filters' => array('StringTrim'),
 			'validators' => array(
 				array('StringLength', false, array(0, 30)),
@@ -43,20 +51,8 @@ class user_Form_Pool extends Zend_Form
 		
         $this->addElement('button', 'Cancel', array(
             'onclick' => 'self.location="/user/pool/index/page/'.$this->page.'"'
-        ));  
-        
-        $this->addElement('hidden','page', array(
-        	'value' => $this->page
-        ));
+        )); 
     }
-	private $buttontext = 'Save';
-	function setButtontext($v){
-		$this->buttontext = $v;
-	}
-	private $page;
-	function setPage($page){
-		$this->page = $page;
-	}
 
 }
 
diff --git a/application/modules/user/forms/PoolClient.php b/application/modules/user/forms/PoolClient.php
index c4c6e7f..d259723 100644
--- a/application/modules/user/forms/PoolClient.php
+++ b/application/modules/user/forms/PoolClient.php
@@ -3,7 +3,20 @@
 class user_Form_PoolClient extends Zend_Form
 {
 	private $clients;
-
+	private $page;
+	private $buttontext = 'Save';
+	
+	function setButtontext($v){
+		$this->buttontext = $v;
+	}
+	public function setClients($clients){
+		$this->clients = $clients;
+		return $this;
+	}
+	public function setPage($page){
+		$this->page = $page;
+	}
+	
     public function init()
     {
         $this->setName("addClientToPool");
@@ -21,14 +34,10 @@ class user_Form_PoolClient extends Zend_Form
             'ignore'   => true,
             'label'    => 'Save',
         ));  
+        $this->addElement('button', 'Cancel', array(
+            'onclick' => 'self.location="/user/filter/index/page/'.$this->page.'"'
+        ));
     }
-	public function setClients($clients){
-		$this->clients = $clients;
-		return $this;
-	}
-	private $buttontext = 'Save';
-	function setButtontext($v){
-		$this->buttontext = $v;
-	}
+	
 }
 
diff --git a/application/modules/user/forms/Preboot.php b/application/modules/user/forms/Preboot.php
index cc437c5..2b8ccff 100644
--- a/application/modules/user/forms/Preboot.php
+++ b/application/modules/user/forms/Preboot.php
@@ -5,14 +5,17 @@ class user_Form_Preboot extends Zend_Form
 
 	private $action;
 	private $rights;
+	private $page;
 	
     public function setRights($rights){
     	$this->rights = $rights;
     }
     public function setAction($action){
-    	$this->action = $action;
-    	
+    	$this->action = $action;    	
     }
+    public function setPage($p){
+    	$this->page = $p;	
+    }    
 	
     public function init()
     {
@@ -53,8 +56,8 @@ class user_Form_Preboot extends Zend_Form
             'label'    => $label,
         ));  
         
-        $this->addElement('button', 'Cancel', array(
-            'onclick' => 'self.location="/user/preboot"'
+       $this->addElement('button', 'Cancel', array(
+            'onclick' => 'self.location="/user/preboot/index/page/'.$this->page.'"'
         ));  
 
     }