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

1 files changed, 7 insertions, 2 deletions

diff --git a/application/modules/user/forms/BootmenuEntries.php b/application/modules/user/forms/BootmenuEntries.php
index 58a2820..3168bee 100644
--- a/application/modules/user/forms/BootmenuEntries.php
+++ b/application/modules/user/forms/BootmenuEntries.php
@@ -8,6 +8,7 @@ class user_Form_BootmenuEntries extends Zend_Form
 	private $maxorder;
 	private $action;
 	private $page;	
+	private $type;	
 	
     public function setAction($action){
     	$this->action = $action;
@@ -30,6 +31,10 @@ class user_Form_BootmenuEntries extends Zend_Form
     	$this->configlist = $configlist;    	
     }
     
+	public function setType($type){
+		$this->type = $type;
+	}
+    
 	public function setPage($page){
 		$this->page = $page;
 	}
@@ -48,7 +53,7 @@ class user_Form_BootmenuEntries extends Zend_Form
         $this->setName($this->action);
 		$this->setMethod('post');
 		
-		if (!Pbs_Acl::checkRight('booee'))
+		if (!Pbs_Acl::checkRight('booee') && $this->action == 'editbootmenuentry')
 			$meta = true;
 		else 
 			$meta = null;
@@ -152,7 +157,7 @@ class user_Form_BootmenuEntries extends Zend_Form
         ));  
         
         $this->addElement('button', 'Cancel', array(
-            'onclick' => 'self.location="/user/bootmenu/index/page/'.$this->page.'"'
+            'onclick' => 'self.location="/user/bootmenu/index/type/'.$this->type.'/page/'.$this->page.'"'
         ));  
 
     }