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

1 files changed, 1 insertions, 19 deletions

diff --git a/application/modules/user/forms/LinkRight.php b/application/modules/user/forms/LinkRight.php
index d99c2b6..8fe2f46 100644
--- a/application/modules/user/forms/LinkRight.php
+++ b/application/modules/user/forms/LinkRight.php
@@ -3,17 +3,12 @@
 class user_Form_LinkRight extends Zend_Form
 {
 	private $rightlist;
-	private $rightcategorieslist;
 	private $roleID;
 
 	public function setRightlist($rightlist){
 		$this->rightlist = $rightlist;
 	}
 
-	public function setRightcategorieslist($rightcategorieslist){
-		$this->rightcategorieslist = $rightcategorieslist;
-	}
-
 	public function setRoleID($roleID){
 		$this->roleID = $roleID;
 	}
@@ -23,20 +18,7 @@ class user_Form_LinkRight extends Zend_Form
 		$this->setName("LinkRight");
 		$this->setMethod('post');
 
-		$rightfield = $this->createElement('select','rightID');
-		$rightfield ->setLabel('Right:');
-
-		if(count($this->rightlist)>0){
-			foreach($this->rightcategorieslist as $k => $v) {
-				$rightfield->addMultiOption("category" . $k, "---" . $v . "---");
-				$rights = $this->rightlist[$k];
-				foreach($rights as $right => $r){
-					$rightfield->addMultiOption($r->getID(), $r->getTitle());
-					$count++;
-				}
-
-			}
-		}
+		$rightfield = $this->createElement('select','rightID',array('label'=> 'Right: ','required' => true,'multioptions'=> $this->rightlist));
 		$rightfield->setRegisterInArrayValidator(false);
 		$this->addElement($rightfield);