23 Nov
2015
23 Nov
'15
9:10 a.m.
Module: check_mk
Branch: master
Commit: 445cd31e59f49fb4881ce55df5d3e959378a1f43
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=445cd31e59f49f…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Nov 23 10:09:18 2015 +0100
#2845 FIX LDAP: Fixed exception in connection test on complain issue during connection
creation
---
.werks/2845 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/2845 b/.werks/2845
new file mode 100644
index 0000000..7db5b34
--- /dev/null
+++ b/.werks/2845
@@ -0,0 +1,10 @@
+Title: LDAP: Fixed exception in connection test on complain issue during connection
creation
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i4
+Date: 1448269716
+
+
diff --git a/ChangeLog b/ChangeLog
index 88fa85e..bfa1da5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -136,6 +136,7 @@
* 2767 FIX: Fixed broken user list when non unicode mail addresses are loaded
* 2791 FIX: Service parameter overview: Fixed problem displaying incorrect rule for
classical checks...
* 2793 FIX: Parameter Overview: Prevent python unicode warnings for services with
umlauts...
+ * 2845 FIX: LDAP: Fixed exception in connection test on complain issue during
connection creation
Notifications:
* 2728 FIX: Removed debug notification script (was not executable)...
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 894db11..074e6a6 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -8056,7 +8056,7 @@ def mode_edit_ldap_connection(phase):
html.write('</td><td style="padding-left:10px;">')
html.write('<h2>' + _('Diagnostics') + '</h2>')
- if not html.var('_test'):
+ if not html.var('_test') or not connection_id:
html.message(HTML('<p>%s</p><p>%s</p>' %
(_('You can verify the single parts of your ldap configuration
using this '
'dialog. Simply make your configuration in the form on the
left side and '