openrat-cms

commit 5ea464d43fb527bef37c32b362e380dcf4ce0f06
parent 34a5b71ec47a4336f54a37c24489ea1f6551fafc
Author: Jan Dankert <devnull@localhost>
Date:   Tue,  8 Nov 2011 21:51:37 +0100

Fix: Anzeige von Rechten

Diffstat:
action/ObjectAction.class.php
 | 
10
+++++-----
themes/default/templates/object/rights.tpl.src.php
 | 
32
++++++++++++++------------------

2 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/action/ObjectAction.class.php b/action/ObjectAction.class.php
@@ -103,7 +103,7 @@ class ObjectAction extends Action
 	  *
 	  * @access public
 	  */
-	function addacl()
+	function aclformAction()
 	{
 		$acl = new Acl();
 
@@ -222,7 +222,7 @@ class ObjectAction extends Action
 			$acl->load();
 			$key = 'bu'.$acl->username.'g'.$acl->groupname.'a'.$aclid;
 			$acllist[$key] = $acl->getProperties();
-			$acllist[$key]['delete_url'] = Html::url($this->actionName,'delacl',$o->objectid,array('aclid'=>$aclid));
+			$acllist[$key]['aclid'] = $aclid;
 		}
 		ksort( $acllist );
 
@@ -237,7 +237,7 @@ class ObjectAction extends Action
 	 * 
 	 * @return unknown_type
 	 */
-	function inherit()
+	function inheritAction()
 	{
 		$log = array();
 		
@@ -299,7 +299,7 @@ class ObjectAction extends Action
 	/**
 	 * Formular anzeigen, um Rechte hinzufuegen
 	 */
-	function aclform()
+	function aclformView()
 	{
 		$o = Session::getObject();
 		$o->objectLoadRaw();
@@ -324,7 +324,7 @@ class ObjectAction extends Action
 	 * 
 	 * @access protected
 	 */
-	function delacl()
+	function delaclAction()
 	{
 		$acl = new Acl($this->getRequestVar('aclid'));
 		$acl->objectid = $this->getRequestId();
diff --git a/themes/default/templates/object/rights.tpl.src.php b/themes/default/templates/object/rights.tpl.src.php
@@ -14,8 +14,7 @@ dummy
 							text key:var:t prefix:acl_ suffix:_abbrev
 	
 					cell class:help
-						if true:mode:edit
-							text key:global_delete
+						text key:global_delete
 							
 				if empty:acls
 					row class:data
@@ -44,25 +43,22 @@ dummy
 							cell
 								checkbox name:var:t default:false readonly:true
 						cell
-							if true:mode:edit
-								if present:delete_url
-										link url:var:delete_url
-											text key:GLOBAL_DELETE
+							link type:post subaction:delacl id:var:aclid
+								text key:GLOBAL_DELETE
 		
-				if true:mode:edit
-					if value:var:type equals:folder
-						row
-							cell colspan:15
-								fieldset title:message:options
-						row
-							cell colspan:15
-								set var:inherit value:1
-								input type:checkbox name:inherit
-								label for:inherit
-									text key:inherit_rights
+				if value:var:type equals:folder
+					row
+						cell colspan:15
+							fieldset title:message:options
+					row
+						cell colspan:15
+							set var:inherit value:1
+							input type:checkbox name:inherit
+							label for:inherit
+								text key:inherit_rights
 				row
 					cell class:act colspan:15
 						button type:ok
-						link class:action action:var:actionName subaction:aclform
+						link type:view class:action action:var:actionName subaction:aclform
 							image icon:add
 							text key:add 
\ No newline at end of file