Updated gotoLogView

-Do not display warnings about not working supportDaemonUri if it not configured.

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

diff --git a/gosa-plugins/goto/addons/goto/class_gotoLogView.inc b/gosa-plugins/goto/addons/goto/class_gotoLogView.inc
index 1eb5604d9e9355b109df0e45becb1f0e5b0bd110..a5e166ff2dcd61663e69b432a26046c0cd6ffc32 100644 (file)
--- a/gosa-plugins/goto/addons/goto/class_gotoLogView.inc
+++ b/gosa-plugins/goto/addons/goto/class_gotoLogView.inc
@@ -53,7 +53,7 @@ class gotoLogView extends plugin
     /* Query for log files
      */
     $res = $this->o_queue->get_log_info_for_mac($this->mac);
-    if($this->o_queue->is_error()){
+    if($this->o_queue->is_configured() && $this->o_queue->is_error()){
       msg_dialog::display(_("Error"), $this->o_queue->get_error(), ERROR_DIALOG);
     }
 
@@ -171,7 +171,7 @@ class gotoLogView extends plugin
   function get_log($mac,$date,$file)
   {
     $res = $this->o_queue->get_log_file($mac,$date,$file);
-    if($this->o_queue->is_error()){
+    if($this->o_queue->is_configured() && $this->o_queue->is_error()){
       msg_dialog::display(_("Error"), $this->o_queue->get_error(), ERROR_DIALOG);
     }
     $res = nl2br(htmlentities($res));

diff --git a/gosa-plugins/systems/admin/systems/class_termDNS.inc b/gosa-plugins/systems/admin/systems/class_termDNS.inc
index 1cf1a4c1848c6c192ad48f8426c3eb88f57adf55..6fd06d3c602077beda626330b3699d2c0657c0e4 100644 (file)
--- a/gosa-plugins/systems/admin/systems/class_termDNS.inc
+++ b/gosa-plugins/systems/admin/systems/class_termDNS.inc
@@ -254,6 +254,7 @@ class termDNS extends plugin
   {
          /* Call parent execute */
     $smarty= get_smarty();
+    $smarty->assign("autonetACL",$this->acl_is_writeable("macAddress").$this->acl_is_writeable("ipHostNumber"));
 
     $tmp = $this->plInfo();
     foreach($tmp['plProvidedAcls'] as $name => $translation){