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

1 files changed, 17 insertions, 4 deletions

diff --git a/application/forms/BootmenuEntriesEdit.php b/application/forms/BootmenuEntriesEdit.php
index 7fd97fe..6dc1aab 100644
--- a/application/forms/BootmenuEntriesEdit.php
+++ b/application/forms/BootmenuEntriesEdit.php
@@ -24,6 +24,12 @@ class Application_Form_BootmenuEntriesEdit extends Zend_Form
 	
    public function init()
     {
+    	
+       	if(!isset($_POST['bootosID'])){
+  			$firstbootos = array_slice($this->bootoslist,0,1);
+  			$_POST['bootosID'] = $firstbootos[0]->getID();
+    	}
+    	
         $this->setName("BootMenuEntryAdd");
 		$this->setMethod('post');
 
@@ -37,7 +43,9 @@ class Application_Form_BootmenuEntriesEdit extends Zend_Form
 		));
 		
 		$bootosfield = $this->createElement('select','bootosID');
-        $bootosfield ->setLabel('BootOs:');
+        $bootosfield->setLabel('BootOs:');
+        $bootosfield->setAttrib('onChange', "document.getElementById('BootMenuEntryAdd').submit();");
+        
         
         if(count($this->bootoslist)>0){
 			foreach($this->bootoslist as $bootos => $b){
@@ -52,18 +60,23 @@ class Application_Form_BootmenuEntriesEdit extends Zend_Form
 			'validators' => array(
 				array('StringLength', false, array(0, 50)),
 			),
-			'required' => true,
+			'required' => false,
 			'cols' => 50,
 			'rows' => 5,
 			'label' => 'KCL:',
+			'value' => $this->bootoslist[$_POST['bootosID']]->getDefaultkcl()
 		));
 		
+		$defaultconfigid = $this->bootoslist[$_POST['bootosID']]->getConfigID();	
 		$configfield = $this->createElement('select','configID');
-        $configfield ->setLabel('Config:');
+        $configfield->setLabel('Config:');
+        $configfield->addMultiOption($defaultconfigid, 'default');
+        
         
         if(count($this->configlist)>0){
 			foreach($this->configlist as $config => $c){
-				$configfield->addMultiOption($c->getID(), $c->getTitle());
+				if($c->getID() != $defaultconfigid)
+					$configfield->addMultiOption($c->getID(), $c->getTitle());
 			}       
         }
 		$configfield->setRegisterInArrayValidator(false);