Module: check_mk
Branch: master
Commit: 44127526c2c954a6a62a9e3a38576f9a8982977b
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44127526c2c954…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Jan 14 14:53:14 2015 +0100
#1813 FIX Fixed bug in event console rule editor when no contact groups configured
---
.werks/1813 | 10 ++++++++++
ChangeLog | 3 ++-
web/htdocs/valuespec.py | 3 ---
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/.werks/1813 b/.werks/1813
new file mode 100644
index 0000000..3b12ad6
--- /dev/null
+++ b/.werks/1813
@@ -0,0 +1,10 @@
+Title: Fixed bug in event console rule editor when no contact groups configured
+Level: 1
+Component: ec
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1421243568
+
+
diff --git a/ChangeLog b/ChangeLog
index 75f5ec1..77e1ac2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,7 +31,7 @@
* 1807 check_mail: Added new check to check IMAP/POP3 login (incl. forwarding of
mails to event console)...
* 1841 fileinfo, fileinfo.groups: new parameter for selecting ranges of the time of
the day...
* 1668 Interface groups: Can create groups out of interface item names...
- * 1669 mrpe script check_16bit_program.exe: Monitors 16 bit programs...
+ * 1669 mrpe program check_16bit_program.cc: Monitors 16 bit programs on windows...
* 1457 FIX: logins: new check renamed from "users" check...
NOTE: Please refer to the migration notes!
* 1762 FIX: lnx_thermal: Now ignoring trip points with level 0...
@@ -112,6 +112,7 @@
Event Console:
* 1839 FIX: Fix exception when notifying EC alert into monitoring for traps (because
PID is missing)
+ * 1813 FIX: Fixed bug in event console rule editor when no contact groups configured
1.2.6b1:
diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py
index 6f5b4ee..fe35b9e 100644
--- a/web/htdocs/valuespec.py
+++ b/web/htdocs/valuespec.py
@@ -2938,9 +2938,6 @@ class ElementSelection(ValueSpec):
self.load_elements()
if len(self._elements) > 0:
return self._elements.keys()[0]
- else:
- raise MKUserError(None,
- _("There are not defined any elements for this selection yet."))
def render_input(self, varprefix, value):
self.load_elements()