Updated display for folderPath and folderName, do not show replacement {%cn} in folde...

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20027 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 d7270b94e681ac907f8148edb22c80a14b4c0d6f..a6d41fd80550cc3fc9818e4f5cb968b37e318771 100644 (file)
--- a/gosa-plugins/groupware/personal/groupware/FolderWidget/FolderEditDialog.tpl
+++ b/gosa-plugins/groupware/personal/groupware/FolderWidget/FolderEditDialog.tpl
@@ -15,11 +15,11 @@
 <table>
     <tr>
         <td>{t}Name{/t}:&nbsp;</td>
-        <td>{$folderItem.name}</td>
+        <td>{$folderName}</td>
     </tr>
     <tr>
         <td>{t}Path{/t}:&nbsp;</td>
-        <td>{$folderItem.path}</td>
+        <td>{$folderPath}</td>
     </tr>
 </table>
 {/if}

diff --git a/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderEditDialog.inc b/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderEditDialog.inc
index e4e3ab87e29509dd4e9b5cf37df44e79a00ba47e..006bd227afff428d6553ce2b1271f9c698359916 100644 (file)
--- a/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderEditDialog.inc
+++ b/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderEditDialog.inc
@@ -27,7 +27,13 @@ class FolderEditDialog extends plugin
 
     function execute()
     {
-        $smarty = get_smarty(); 
+        $smarty = get_smarty();
+
+        // Prepare folder name and path     
+        $smarty->assign('folderName', preg_replace("/\{%cn\}/", "<i>Group name</i>", $this->folderItem['name']));
+        $smarty->assign('folderPath', preg_replace("/\{%cn\}/", "<i>Group name</i>", $this->folderItem['path']));
+        
+ 
         $smarty->assign('folderItem', $this->folderItem);
         $smarty->assign('permissions', $this->permissions);
         $smarty->assign('permissionCnt', count($this->permissions));