summaryrefslogtreecommitdiffstats
path: root/application/modules
diff options
context:
space:
mode:
authorBjörn Geiger2011-04-11 14:38:16 +0200
committerBjörn Geiger2011-04-11 14:38:16 +0200
commit1f95b2190d1be70f358f6921cd8d2e80bace3ec6 (patch)
tree9d46d3525b04a7b433b6c585205f9e4e0615393f /application/modules
parentBessere Fehlerbeschreibung bei Registrierung (diff)
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-1f95b2190d1be70f358f6921cd8d2e80bace3ec6.tar.gz
pbs2-1f95b2190d1be70f358f6921cd8d2e80bace3ec6.tar.xz
pbs2-1f95b2190d1be70f358f6921cd8d2e80bace3ec6.zip
Merge branch 'master' of ssh://git.openslx.org/lsfks/master-teamprojekt/pbs2
Diffstat (limited to 'application/modules')
-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
3 files changed, 3 insertions, 2 deletions
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(