summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
Diffstat (limited to 'application')
-rw-r--r--application/controllers/ResourceController.php12
-rw-r--r--application/modules/user/controllers/BootmenuController.php2
-rw-r--r--application/modules/user/forms/Preboot.php2
-rw-r--r--application/modules/user/views/scripts/filter/index.phtml1
4 files changed, 11 insertions, 6 deletions
diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php
index 64d9885..a60b3c9 100644
--- a/application/controllers/ResourceController.php
+++ b/application/controllers/ResourceController.php
@@ -129,6 +129,7 @@ class ResourceController extends Zend_Controller_Action
$bmemapper = new Application_Model_BootMenuEntriesMapper();
$bme = new Application_Model_BootMenuEntries();
+ $bootosmapper = new Application_Model_BootOsMapper();
$bmemapper->find($bmeID,$bme);
header('Content-Type: text/html');
@@ -137,11 +138,14 @@ class ResourceController extends Zend_Controller_Action
header('Pragma: no-cache');
header('Expires: 0');
- if($bme->getKcl() != null)
- $result = $bme->getKcl() . " alpha=" . $this->_request->getParam('alpha') . " " . $bme->getKclappend();
- else
+ if($bme->getKcl() != null){
+ @list($bootos) = $bootosmapper->findBy(array('defaultkcl', $bme->getKcl()));
+ $kcl = $bootos->getDefaultkcl();
+
+ $result = $kcl . " alpha=" . $this->_request->getParam('alpha') . " " . $bme->getKclappend();
+ }else{
$result = "alpha=" . $this->_request->getParam('alpha') . " " .$bme->getKclappend();
-
+ }
echo $result;
diff --git a/application/modules/user/controllers/BootmenuController.php b/application/modules/user/controllers/BootmenuController.php
index 30e4098..e60679a 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;
diff --git a/application/modules/user/forms/Preboot.php b/application/modules/user/forms/Preboot.php
index 99c7563..9d2f3aa 100644
--- a/application/modules/user/forms/Preboot.php
+++ b/application/modules/user/forms/Preboot.php
@@ -18,7 +18,7 @@ class user_Form_Preboot extends Zend_Form
$this->setName($this->action);
$this->setMethod('post');
- if (!Pbs_Acl::checkRight('pre'))
+ if ((!Pbs_Acl::checkRight('pre') && $this->action == 'editpreboot'))
$meta = true;
else
$meta = null;
diff --git a/application/modules/user/views/scripts/filter/index.phtml b/application/modules/user/views/scripts/filter/index.phtml
index 098c43d..a242a7b 100644
--- a/application/modules/user/views/scripts/filter/index.phtml
+++ b/application/modules/user/views/scripts/filter/index.phtml
@@ -1,5 +1,6 @@
<h1>Filters</h1>
<?php if($this->notification != ''){echo $this->notification;} ?>
+<div class='infobox'>The default userfilters uses the priority 25</div>
<?php echo $this->searchform; ?>
<?php if(Pbs_Acl::checkRight('fa')):?>
<?php echo $this->formButton('createconfig', 'Create Filter', array(