diff options
| author | Simon | 2011-03-16 13:01:52 +0100 |
|---|---|---|
| committer | Simon | 2011-03-16 13:01:52 +0100 |
| commit | 23356b4d986955a981c4b164bea553c2560aec4a (patch) | |
| tree | a023e77bf92a31ba314a5e58e3cf11861915e579 /application/modules/dev | |
| parent | Arbeiten am Clientcontroller, Membership in Auth gesetzt (diff) | |
| parent | Default KCL wird jetzt automatisch geupdated (diff) | |
| download | pbs2-23356b4d986955a981c4b164bea553c2560aec4a.tar.gz pbs2-23356b4d986955a981c4b164bea553c2560aec4a.tar.xz pbs2-23356b4d986955a981c4b164bea553c2560aec4a.zip | |
Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules/dev')
4 files changed, 43 insertions, 2 deletions
diff --git a/application/modules/dev/controllers/ErrorController.php b/application/modules/dev/controllers/ErrorController.php index 189614b..f317494 100644 --- a/application/modules/dev/controllers/ErrorController.php +++ b/application/modules/dev/controllers/ErrorController.php @@ -6,7 +6,6 @@ class dev_ErrorController extends Zend_Controller_Action public function errorAction() { $errors = $this->_getParam('error_handler'); - switch ($errors->type) { case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_ROUTE: case Zend_Controller_Plugin_ErrorHandler::EXCEPTION_NO_CONTROLLER: @@ -21,6 +20,7 @@ class dev_ErrorController extends Zend_Controller_Action // application error $this->getResponse()->setHttpResponseCode(500); $this->view->message = 'Application error'; + print_a($errors); break; } diff --git a/application/modules/dev/forms/BootmenuEntriesAdd.php b/application/modules/dev/forms/BootmenuEntriesAdd.php index 2e1b677..ef6e909 100644 --- a/application/modules/dev/forms/BootmenuEntriesAdd.php +++ b/application/modules/dev/forms/BootmenuEntriesAdd.php @@ -54,6 +54,12 @@ class dev_Form_BootmenuEntriesAdd extends Zend_Form $this->addElement($bootosfield); + $kclactive = $this->createElement('checkbox','kclactive'); + #$kclactive->setAttrib('onChange', "document.getElementById('BootMenuEntryAdd').submit();"); + $kclactive->setLabel('Use default KCL:'); + $kclactive->setValue(true); + $this->addElement($kclactive); + $this->addElement('textarea', 'kcl', array( 'filters' => array('StringTrim'), 'validators' => array( @@ -63,10 +69,25 @@ class dev_Form_BootmenuEntriesAdd extends Zend_Form 'cols' => 50, 'rows' => 5, 'label' => 'KCL:', + 'readOnly' => true, 'value' => $this->bootoslist[$_POST['bootosID']]->getDefaultkcl() )); + + + $this->addElement('textarea', 'kclappend', array( + 'filters' => array('StringTrim'), + 'validators' => array( + array('StringLength', false, array(0, 50)), + ), + 'required' => false, + 'cols' => 50, + 'rows' => 5, + 'label' => 'KCL-Append:' + + )); + $defaultconfigid = $this->bootoslist[$_POST['bootosID']]->getConfigID(); $configfield = $this->createElement('select','configID'); $configfield->setLabel('Config:'); diff --git a/application/modules/dev/forms/BootmenuEntriesEdit.php b/application/modules/dev/forms/BootmenuEntriesEdit.php index 57aa053..394563e 100644 --- a/application/modules/dev/forms/BootmenuEntriesEdit.php +++ b/application/modules/dev/forms/BootmenuEntriesEdit.php @@ -55,6 +55,12 @@ class dev_Form_BootmenuEntriesEdit extends Zend_Form $bootosfield->setRegisterInArrayValidator(false); $this->addElement($bootosfield); + $kclactive = $this->createElement('checkbox','kclactive'); + #$kclactive->setAttrib('onChange', "document.getElementById('BootMenuEntryAdd').submit();"); + $kclactive->setLabel('Use default KCL:'); + $kclactive->setValue(true); + $this->addElement($kclactive); + $this->addElement('textarea', 'kcl', array( 'filters' => array('StringTrim'), 'validators' => array( @@ -64,9 +70,22 @@ class dev_Form_BootmenuEntriesEdit extends Zend_Form 'cols' => 50, 'rows' => 5, 'label' => 'KCL:', + 'readOnly' => true, 'value' => $this->bootoslist[$_POST['bootosID']]->getDefaultkcl() )); + $this->addElement('textarea', 'kclappend', array( + 'filters' => array('StringTrim'), + 'validators' => array( + array('StringLength', false, array(0, 50)), + ), + 'required' => false, + 'cols' => 50, + 'rows' => 5, + 'label' => 'KCL-Append:' + + )); + $defaultconfigid = $this->bootoslist[$_POST['bootosID']]->getConfigID(); $configfield = $this->createElement('select','configID'); $configfield->setLabel('Config:'); diff --git a/application/modules/dev/views/scripts/bootmenu/index.phtml b/application/modules/dev/views/scripts/bootmenu/index.phtml index c42a09a..d321758 100644 --- a/application/modules/dev/views/scripts/bootmenu/index.phtml +++ b/application/modules/dev/views/scripts/bootmenu/index.phtml @@ -64,7 +64,7 @@ <!-- <th>BootmenuID</th>--> <th>BootOS</th> <th>kcl</th> - + <th>kclappend</th> <th>Config</th> <th>Position</th> <th colspan=2>Actions</th> @@ -93,6 +93,7 @@ <!--<td><?php echo $this->escape($bootmenuentry->getBootmenuID()); ?></td> --><td><?php echo "[".$this->escape($bootmenuentry->getBootosID()."] ". $bootos->getTitle()); ?></td> <td><?php echo $this->escape($bootmenuentry->getkcl()); ?></td> + <td><?php echo $this->escape($bootmenuentry->getkclappend()); ?></td> <td><?php echo "[".$this->escape($bootmenuentry->getConfigID()."] ". $config->getTitle()); ?></td> <td><?php echo $this->escape($bootmenuentry->getOrder() + 1); ?></td> <td class='action'><a href="<?php echo $this->url( |