[checkmk-commits] Check_MK Git: check_mk: Fixed layout of error message when deleting host tags

Module: check_mk Branch: master Commit: 80b463c2f722798f1cdce3c7289be789bd432594 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80b463c2f72279… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Fri Oct 18 21:01:20 2013 -0400 Fixed layout of error message when deleting host tags --- .bugs/1072 | 6 ++++-- .bugs/626 | 4 ++-- .bugs/665 | 4 +++- web/htdocs/wato.py | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.bugs/1072 b/.bugs/1072 index a21fb0a..1cf3dcd 100644 --- a/.bugs/1072 +++ b/.bugs/1072 @@ -1,11 +1,13 @@ Title: Removing a tag: error message garbled up Component: wato -State: open +Class: nastiness +State: done Date: 2013-10-15 21:30:44 Targetversion: future -Class: nastiness When you delete a tag group and the tag is still referred to by a folder, the affected folders are printed in a warning message. But the line feeds are fixed up. The first folder is printed indented, the following ones not. + +2013-10-18 21:01:10: changed state open -> done diff --git a/.bugs/626 b/.bugs/626 index d8cb0bb..be09f88 100644 --- a/.bugs/626 +++ b/.bugs/626 @@ -5,5 +5,5 @@ Date: 2012-02-06 12:44:52 Targetversion: 1.4.0 Class: nastiness -Damit sollen Connect Versuche verringert werden und Fehlermeldungen während eines Nagios -Neustarts verhindert werden. +Damit sollen Connect Versuche verringert werden und Fehlermeldungen während +eines Nagios Neustarts verhindert werden. diff --git a/.bugs/665 b/.bugs/665 index a84b97e..5b2ce95 100644 --- a/.bugs/665 +++ b/.bugs/665 @@ -7,6 +7,8 @@ Class: nastiness The following packages need to be installed manually after ./configure has been called xorg-x11-server-Xvfb -pythin-ldap +python-ldap They are only set in OS_PACKAGES, but probably needed in BUILD_PACKAGES +But what happens if they are missing? Are they needed during compilation? + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index eef918f..1352af3 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9977,7 +9977,7 @@ def rename_host_tags_after_confirmation(tag_id, operations): message += '<li><a href="%s">%s</a></li>' % ( make_link_to([("mode", "editfolder")], folder), folder["title"]) - message += "</ul>" + message += "</ul>" if affected_hosts: message += _("Hosts where this tag group is explicitely set " @@ -10018,7 +10018,7 @@ def rename_host_tags_after_confirmation(tag_id, operations): else: wato_html_head(_("Confirm tag modifications")) html.write("<div class=really>") - html.write("<h3>" + _("Your modifications affects some objects") + "</h3>") + html.write("<h3>" + _("Your modifications affect some objects") + "</h3>") html.write(message) html.write("<br>" + _("WATO can repair things for you. It can rename tags in folders, host and rules. " "Removed tag groups will be removed from hosts and folders, removed tags will be "