Module: check_mk
Branch: master
Commit: 4017bd67e1594df300f426d91c32db2d93262c09
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4017bd67e1594d…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Jul 3 16:41:45 2014 +0200
FIX Remove icon for service parameters in WATO service list for missing services
In the services list of a host in WATO in the section <i>Available (missing)
services</i>
the icon for the service parameters has been removed. It didn't work properly because
Check_MK cannot safely analyse non-existent services. It is dangerous anyway if the user
thinks he could do configuration for those services.
---
.werks/1044 | 11 +++++++++++
ChangeLog | 1 +
modules/automation.py | 2 +-
web/htdocs/wato.py | 11 ++++++-----
4 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/.werks/1044 b/.werks/1044
new file mode 100644
index 0000000..c5061b4
--- /dev/null
+++ b/.werks/1044
@@ -0,0 +1,11 @@
+Title: Remove icon for service parameters in WATO service list for missing services
+Level: 1
+Component: wato
+Version: 1.2.5i5
+Date: 1404398390
+Class: fix
+
+In the services list of a host in WATO in the section <i>Available (missing)
services</i>
+the icon for the service parameters has been removed. It didn't work properly
because
+Check_MK cannot safely analyse non-existent services. It is dangerous anyway if the user
+thinks he could do configuration for those services.
diff --git a/ChangeLog b/ChangeLog
index b501045..9228911 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -43,6 +43,7 @@
* 1004 FIX: Fix exception when saving rules, caused by empty item
* 0947 FIX: WATO snapshots: fixed missing files on restoring nagvis backup domains
* 0826 FIX: Fixed problem where user access times were not updated correctly
+ * 1044 FIX: Remove icon for service parameters in WATO service list for missing
services...
Notifications:
* 1042 Rule based notifications: allow matching on host groups...
diff --git a/modules/automation.py b/modules/automation.py
index e0eca6c..2882a54 100644
--- a/modules/automation.py
+++ b/modules/automation.py
@@ -637,7 +637,7 @@ def automation_analyse_service(args):
"item" : item,
"inv_parameters" : params,
"factory_settings" : fs,
- "parameters" : compute_check_parameters(hostname, ct,
item, params),
+ "parameters" : compute_check_parameters(hostname, ct,
item, params),
}
except:
if opt_debug:
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 4fb4a60..a96c89a 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -3343,12 +3343,13 @@ def show_service_table(host, firsttime):
# #html.write('<a href="%s"><img
title="%s" class=icon
src="images/icon_rulesets.png"></a>' %
# # (url, title))
- # Icon for Service parameters
+ # Icon for Service parameters. Not for missing services!
table.cell("", "")
- params_url = make_link([("mode", "object_parameters"),
- ("host", hostname),
- ("service", descr)])
- html.icon_button(params_url, _("View and modify the parameters for this
service"), "rulesets")
+ if state_type != "new":
+ params_url = make_link([("mode",
"object_parameters"),
+ ("host", hostname),
+ ("service", descr)])
+ html.icon_button(params_url, _("View and modify the parameters for
this service"), "rulesets")
# Permanently disable icon