From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 8 Oct 2010 12:36:38 +0000 (+0000)
Subject: Added ACL handling
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a0e89c88bb500a552b7cca9f6e46c755c5aa36f7;p=gosa.git

Added ACL handling


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@19955 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/groupware/personal/groupware/FolderWidget/FolderEditDialog.tpl b/gosa-plugins/groupware/personal/groupware/FolderWidget/FolderEditDialog.tpl
index 1a4c50991..844b81fe9 100644
--- a/gosa-plugins/groupware/personal/groupware/FolderWidget/FolderEditDialog.tpl
+++ b/gosa-plugins/groupware/personal/groupware/FolderWidget/FolderEditDialog.tpl
@@ -25,7 +25,11 @@
         <tr>
             <td>{$item.type}</td>
             <td><input type='text' name="permission_{$key}_name" value="{$item.name}"></td>
-            <td><input type='text' name="permission_{$key}_acl" value="{$item.acl}"></td>
+            <td>
+                <select name="permission_{$key}_acl" size=1>
+                    {html_options options=$permissions selected=$item.acl}
+                </select>
+            </td>
             <td><button name="permission_{$key}_del">{msgPool type=delButton}</button></td>
         </tr>
     {/foreach}
diff --git a/gosa-plugins/groupware/personal/groupware/FolderWidget/FolderWidget-list.xml b/gosa-plugins/groupware/personal/groupware/FolderWidget/FolderWidget-list.xml
index 10d9e6078..9187502da 100644
--- a/gosa-plugins/groupware/personal/groupware/FolderWidget/FolderWidget-list.xml
+++ b/gosa-plugins/groupware/personal/groupware/FolderWidget/FolderWidget-list.xml
@@ -64,15 +64,8 @@
      <action>
       <name>new</name>
       <type>entry</type>
-      <image>plugins/sudo/images/select_sudo.png[new]</image>
-      <label>Role</label>
-     </action>
-
-     <action>
-      <name>new_default</name>
-      <type>entry</type>
-      <image>plugins/sudo/images/select_sudo.png</image>
-      <label>Default</label>
+      <image>images/lists/folder.png</image>
+      <label>Sub folder</label>
      </action>
 
     </action>
diff --git a/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderEditDialog.inc b/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderEditDialog.inc
index 0f5f6d9fe..5042ac3d5 100644
--- a/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderEditDialog.inc
+++ b/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderEditDialog.inc
@@ -3,6 +3,7 @@
 class FolderEditDialog extends plugin
 {
     private $folderItem = NULL;    
+    private $permissions = array();
 
     function __construct($config, $folderItem)
     {
@@ -10,10 +11,16 @@ class FolderEditDialog extends plugin
         $this->folderItem = $folderItem;
     }
 
+    function setPermissions($perms)
+    {
+        $this->permissions = $perms;
+    }
+
     function execute()
     {
         $smarty = get_smarty(); 
         $smarty->assign('folderItem', $this->folderItem);
+        $smarty->assign('permissions', $this->permissions);
         return($smarty->fetch(get_template_path("FolderEditDialog.tpl", TRUE, dirname(__FILE__))));
     }
 
diff --git a/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidget.inc b/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidget.inc
index 6bba3f0eb..d40dcd49a 100644
--- a/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidget.inc
+++ b/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidget.inc
@@ -13,6 +13,7 @@ class FolderWidget extends plugin
     private $folderList;
 
     private $baseEntryMap = array();
+    private $permissions = array();
 
     function __construct(&$config, $folderList, $accountPrefix)
     {
@@ -33,6 +34,11 @@ class FolderWidget extends plugin
         $this->FolderWidgetListing->setFolderRoot($this->rootBase);
     }
 
+    function setPermissions($perms)
+    {
+        $this->permissions = $perms;
+    }
+
     function pathToDn($path)
     {
         $dn ="";
@@ -143,6 +149,7 @@ class FolderWidget extends plugin
         if($item){
             $this->currentlyEditedItem = $item;
             $this->dialog = new FolderEditDialog($this->config, $item);
+            $this->dialog->setPermissions($this->permissions);
         }
     }