[checkmk-commits] Check_MK Git: check_mk: #1987 FIX Editing auxtags shows existing topics in dropdown instead of as "create new topic"

Module: check_mk Branch: master Commit: eeaf6e0e4695d953b4fd52ba2fe6f2e01f2a733b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eeaf6e0e4695d9… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 20 10:14:20 2015 +0100 #1987 FIX Editing auxtags shows existing topics in dropdown instead of as "create new topic" --- .werks/1987 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 8 ++++---- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.werks/1987 b/.werks/1987 new file mode 100644 index 0000000..b42e85d --- /dev/null +++ b/.werks/1987 @@ -0,0 +1,10 @@ +Title: Editing auxtags shows existing topics in dropdown instead of as "create new topic" +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424423629 + + diff --git a/ChangeLog b/ChangeLog index ebecf56..d608b8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -239,6 +239,7 @@ * 1927 FIX: Fixed level description in WATO rules, change from if above into at * 1976 FIX: Sorting BI rule choice dropdown field entries now * 1986 FIX: Added nicer error message when calling the rename host page with a non existant host + * 1987 FIX: Editing auxtags shows existing topics in dropdown instead of as "create new topic" Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2258c2f..bba807a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12693,9 +12693,9 @@ def parse_hosttag_title(title): else: return None, title -def hosttag_topics(hosttags): +def hosttag_topics(hosttags, auxtags): names = set([]) - for entry in hosttags: + for entry in hosttags + auxtags: topic, title = parse_hosttag_title(entry[1]) if topic: names.add((topic, topic)) @@ -12905,7 +12905,7 @@ def mode_edit_auxtag(phase): vs_topic = OptionalDropdownChoice( title = _("Topic") + "^*", - choices = hosttag_topics(hosttags), + choices = hosttag_topics(hosttags, auxtags), explicit = TextUnicode(), otherlabel = _("Create New Topic"), default_value = None, @@ -13031,7 +13031,7 @@ def mode_edit_hosttag(phase): vs_topic = OptionalDropdownChoice( title = _("Topic"), - choices = hosttag_topics(hosttags), + choices = hosttag_topics(hosttags, auxtags), explicit = TextUnicode(), otherlabel = _("Create New Topic"), default_value = None,