Updated selectable values for kolabFolderType attribute

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

diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc
index 02ed6f8ef138ccb75a1fcc7b9dec4d4eb3156c4b..d0cef980275dfb96a38324e3ed0041ad907e08be 100644 (file)
--- a/plugins/admin/groups/class_groupMail.inc
+++ b/plugins/admin/groups/class_groupMail.inc
@@ -607,14 +607,21 @@ class mailgroup extends plugin
     }
 
     if(isset($this->config->current['MAILMETHOD'])&&preg_match("/olab/i",$this->config->current['MAILMETHOD'])){
+
       $smarty->assign("kolab", TRUE);
+      $smarty->assign("JS",$_SESSION['js']);
       $smarty->assign("kolabFolderType_Types",    array (   ''      => _('Unspecified'),  'mail' => _('Mails'),
                                                             'task'  => _('Tasks') ,       'journal' => _('Journals'),
                                                             'event' => _('Events'),       'contact' => _('Contacts'), 
                                                             'note'  => _('Notes')));
-      $smarty->assign("kolabFolderType_SubTypes", array(    ''          => _('Unspecified'),  'inbox'     => _("Inbox")   , 
-                                                            'drafts'    => _("Drafts"),       'sentitems' => _("Sent items"),
-                                                            'junkemail' => _("Junk mail")));
+      if($this->kolabFolderType_Type == "mail"){
+        $smarty->assign("kolabFolderType_SubTypes", array(    
+              ''          => _('Unspecified'),  'inbox'     => _("Inbox")   , 
+              'drafts'    => _("Drafts"),       'sentitems' => _("Sent items"),
+              'junkemail' => _("Junk mail")));
+      }else{
+        $smarty->assign("kolabFolderType_SubTypes", array(  'default' => _("Default")));
+      }
       $smarty->assign("kolabFolderType_Type",     $this->kolabFolderType_Type);
       $smarty->assign("kolabFolderType_SubType",  $this->kolabFolderType_SubType);
     }else{

diff --git a/plugins/admin/groups/mail.tpl b/plugins/admin/groups/mail.tpl
index 87294edfaef82c18c6991b51a10ea5f2825034d0..ffbcc3e2299d3a708ee4ef91b9a45d0e3542ed5c 100644 (file)
--- a/plugins/admin/groups/mail.tpl
+++ b/plugins/admin/groups/mail.tpl
@@ -43,12 +43,15 @@
                        {t}Folder type{/t}
                </td>
                <td>
-                       <select name="kolabFolderType_Type">
+                       <select name="kolabFolderType_Type" onChange="document.mainform.submit();">
                                {html_options options=$kolabFolderType_Types selected=$kolabFolderType_Type}
                        </select>
-                       <select name="kolabFolderType_SubType">
+                       <select name="kolabFolderType_SubType" onChange="document.mainform.submit();">
                                {html_options options=$kolabFolderType_SubTypes selected=$kolabFolderType_SubType}
                        </select>
+                       {if !$JS}
+                               <input type='image' src='images/list_reload.png' class='center' alt='{t}Reload{/t}'>
+                       {/if}
                </td>
        </tr>
        {/if}