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

1 files changed, 11 insertions, 7 deletions

diff --git a/application/modules/dev/controllers/BootmenuController.php b/application/modules/dev/controllers/BootmenuController.php
index 07924d4..2d2a1df 100644
--- a/application/modules/dev/controllers/BootmenuController.php
+++ b/application/modules/dev/controllers/BootmenuController.php
@@ -100,12 +100,12 @@ class dev_BootmenuController extends Zend_Controller_Action
     	    unset($_POST['kcl']);
     	    unset($_POST['configID']);
     	    $addbootmenuentryForm->populate($_POST);
-    		} else {
+    	} else {
     			
     	        $addbootmenuentryForm = new dev_Form_BootmenuEntriesAdd(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()),$_POST);
     	        
     		    if ($addbootmenuentryForm->isValid($_POST)) {
-
+    		    	
     		    	$bootmenuentry = new Application_Model_BootMenuEntries($_POST);
     		    	$bootmenuentry->setBootmenuID($bootmenuID);
     		    	    		    	
@@ -116,6 +116,9 @@ class dev_BootmenuController extends Zend_Controller_Action
     		    			$bootmenuentry->setOrder($bootmenuentry->getOrder());
  							$bootmenuentrymapper->order($bootmenuentry);
     		    		}
+
+    		    		//print_a($bootmenuentry);
+    		    		
     		            $bootmenuentrymapper->save($bootmenuentry);
     		        }catch(Zend_Exception $e)
     		        {
@@ -225,9 +228,10 @@ class dev_BootmenuController extends Zend_Controller_Action
     		} else {
     		   	
     		   	$bootmenuentrymapper->find($bootmenuentryID, $bootmenuentry);
-    		   	
-    		  	$editbootmenuentryForm = new dev_Form_BootmenuEntriesEdit(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder' => $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()));  
-				if(!isset($_POST['kcl'])){	
+    		       		   	
+    		  	$editbootmenuentryForm = new dev_Form_BootmenuEntriesEdit(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder' => $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll(), 'kcl' => $bootmenuentry->getKcl()));  
+
+    		  	if(!isset($_POST['configID'])){	
     		  		$editbootmenuentryForm->populate($bootmenuentry->toArray()); 
 				}
     		  	else{ 
@@ -237,10 +241,10 @@ class dev_BootmenuController extends Zend_Controller_Action
     		  	}
     		}
     	}else{
-    		$editbootmenuentryForm = new dev_Form_BootmenuEntriesEdit(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll()),$_POST);
+    		$editbootmenuentryForm = new dev_Form_BootmenuEntriesEdit(array('bootoslist'=>$bootosmapper->fetchAll(), 'maxorder'=> $this->_request->getParam('maxorder'), 'configlist'=>$configmapper->fetchAll(), 'kcl' => $bootmenuentry->getKcl()),$_POST);
     			    			
     		if ($editbootmenuentryForm->isValid($_POST)) {
-
+    			
     			$bootmenuentry = new Application_Model_BootMenuEntries($_POST);
     			
     			$bootmenuentry->setBootmenuID($bootmenuID);