From 227eee6de06f42eb2ff87a343b168bc3f99297b6 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 13 Oct 2010 11:31:30 +0000
Subject: [PATCH] Updated display for folderPath and folderName, do not show
 replacement {%cn} in folder Names

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20027 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../personal/groupware/FolderWidget/FolderEditDialog.tpl  | 4 ++--
 .../groupware/FolderWidget/class_FolderEditDialog.inc     | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/gosa-plugins/groupware/personal/groupware/FolderWidget/FolderEditDialog.tpl b/gosa-plugins/groupware/personal/groupware/FolderWidget/FolderEditDialog.tpl
index d7270b94e..a6d41fd80 100644
--- 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 e4e3ab87e..006bd227a 100644
--- 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));
-- 
2.30.2