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

1 files changed, 11 insertions, 6 deletions

diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index 30e4098..d2e3508 100644
--- a/application/modules/user/controllers/BootmenuController.php
+++ b/application/modules/user/controllers/BootmenuController.php
@@ -127,7 +127,7 @@ class user_BootmenuController extends Zend_Controller_Action
 		$pagination->setPageUrl('/user/bootmenu/index/type/'.$this->type.((isset($this->view->search))?'/search/'.$this->view->search:''));
 		$bootmenu = $pagination->getElements();				
 		
-		$this->view->pagination = $pagination->pagination($pageurl);
+		$this->view->pagination = $pagination->pagination();
 		$this->view->page 		= $pagination->getRequestPage();
 		
 		$this->view->bootmenulist = $bootmenu; 
@@ -147,10 +147,10 @@ class user_BootmenuController extends Zend_Controller_Action
     		$this->_redirect('/user/bootmenu/index/type/'.$this->type.'/page/'.$this->page.'/addresult/forbidden');
     		    	
         if (!isset($_POST["createbootmenu"])){
-    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page));
+    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page, 'type'=>$this->type));
     	} else {
     			
-    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page),$_POST);
+    	    $bootmenuForm = new user_Form_Bootmenu(array('action' => 'createbootmenu','page' => $this->page, 'type'=>$this->type),$_POST);
     			    			
     		if ($bootmenuForm->isValid($_POST)) {
 
@@ -192,11 +192,11 @@ class user_BootmenuController extends Zend_Controller_Action
     		
     	if (!isset($_POST["editbootmenu"])){
 
-    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page));
+    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page, 'type'=>$this->type));
     		$bootmenuForm->populate($bootmenu->toArray()); 
     		
     	}else{
-    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page),$_POST);
+    		$bootmenuForm = new user_Form_Bootmenu(array('action' => 'editbootmenu','page' => $this->page, 'type'=>$this->type),$_POST);
     			    			
     		if ($bootmenuForm->isValid($_POST)) {
 
@@ -350,6 +350,7 @@ class user_BootmenuController extends Zend_Controller_Action
     	    	'maxorder'=> $maxorder, 
     	    	'configlist'=> $configlist,
     	    	'page' => $this->page,
+    	    	'type' => $this->type,
     	    	'action' => 'addbootmenuentry',
     	    ));  
     	    
@@ -366,6 +367,7 @@ class user_BootmenuController extends Zend_Controller_Action
     	        	'maxorder'=> $maxorder, 
     	        	'configlist'=>$configlist, 
     	        	'page' => $this->page, 
+    	       		'type' => $this->type,
     	        	'action' => 'addbootmenuentry',
      	        	),$_POST);
     	        
@@ -451,7 +453,8 @@ class user_BootmenuController extends Zend_Controller_Action
 	    }
     	
     	if (!isset($_POST["editbootmenuentry"])){
-	   	
+	   		if(!isset($_POST['bootosID']))
+	   			$_POST['bootosID'] = $bootmenuentry->getBootosID();
     		if(!isset($_POST['kcl']))
     			$_POST['kcl'] = $bootmenuentry->getKcl();
     			
@@ -461,6 +464,7 @@ class user_BootmenuController extends Zend_Controller_Action
     	    	'maxorder'=> $maxorder-1, 
     	    	'configlist'=> $configlist,
     	    	'page' => $this->page,
+    			'type' => $this->type,
     	    	'action' => 'editbootmenuentry', 
     		));  
 
@@ -480,6 +484,7 @@ class user_BootmenuController extends Zend_Controller_Action
     	    	'maxorder'=> $maxorder-1, 
     	    	'configlist'=> $configlist,
     	    	'page' => $this->page,
+    			'type' => $this->type,
     	    	'action' => 'editbootmenuentry'),$_POST);
     			    			
     		if ($bootmenuentryForm->isValid($_POST)) {