From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 8 May 2008 05:46:33 +0000 (+0000)
Subject: Updated blocklists.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=05e542a41fc136accff6e2f63ab79013e11dd595;p=gosa.git

Updated blocklists.
-Hide apply button if it is a new list
-Reninitalize tabs, if apply was pressed.


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

diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc
index a558a26c1..b240e542b 100644
--- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistGeneric.inc
@@ -153,6 +153,7 @@ class blocklistGeneric extends plugin
     $smarty->assign("bases", $this->get_allowed_bases());
     $smarty->assign("types", array(BLOCK_LIST_SEND => _("send"), BLOCK_LIST_RECEIVE => _("receive")));
     $smarty->assign("type", $this->type);
+    $smarty->assign("dn", $this->dn);
     return($smarty->fetch(get_template_path('generic.tpl', TRUE)));
   }
 
diff --git a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
index cfe2f55e1..65b846e3b 100644
--- a/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
+++ b/gosa-plugins/gofax/gofax/blocklists/class_blocklistManagement.inc
@@ -147,6 +147,12 @@ class blocklist extends plugin
           $this->dn= "";
           $this->dialog = NULL;
           session::un_set('objectinfo');
+        }else{
+
+          /* Reinitialize tab */
+          if($this->dialog instanceof tabs){
+            $this->dialog->re_init();
+          }
         }
       } else {
         /* Errors found, show message */
diff --git a/gosa-plugins/gofax/gofax/blocklists/generic.tpl b/gosa-plugins/gofax/gofax/blocklists/generic.tpl
index 4a2c5f8b0..05056c67a 100644
--- a/gosa-plugins/gofax/gofax/blocklists/generic.tpl
+++ b/gosa-plugins/gofax/gofax/blocklists/generic.tpl
@@ -97,7 +97,9 @@
 
 <p class="plugbottom">
   <input type=submit name="edit_finish" style="width:80px" value="{msgPool type=okButton}">
-  <input type=submit name="edit_apply" value="{msgPool type=applyButton}">
+	{if $dn != "new"}
+	  <input type=submit name="edit_apply" value="{msgPool type=applyButton}">
+	{/if}
   <input type=submit name="edit_cancel" value="{msgPool type=cancelButton}">
 </p>
 <input type='hidden' name='blocklist_posted' value="1">