Module: check_mk
Branch: master
Commit: f09991ba54e2cb715c386fb2aca33167525a9a87
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f09991ba54e2cb…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Oct 4 17:40:08 2012 +0200
WATO: WATO folder filter no longer available on single host views
Fixed: Wato filter no longer available when config.wato_enabled == False
---
ChangeLog | 2 ++
web/htdocs/views.py | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 124aa05..ff32f6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@
* FIX: Speed-o-meter: Fixed calculation of Check_MK passive check invervals
* Removed focus of "Full name" attribute on editing a contact
* Quicksearch: Convert search text to regex when accessing livestatus
+ * FIX: WATO Folder filter not available when WATO disabled
+ * WATO Folder Filter no longer available in single host views
BI:
* Added missing localizations
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 92a73ca..7e7c505 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -1182,8 +1182,8 @@ def show_view(view, show_heading = False, show_buttons = True,
# add ubiquitary_filters that are possible for this datasource
for fn in ubiquitary_filters:
- # Disable 'filename' filter, if WATO is disabled
- if fn == "filename" and not config.wato_enabled:
+ # Disable 'wato_folder' filter, if WATO is disabled or there is a single host view
+ if fn == "wato_folder" and (not config.wato_enabled or "host" in view["hide_filters"]):
continue
filter = multisite_filters[fn]
if not filter.info or filter.info in datasource["infos"]:
@@ -1577,8 +1577,8 @@ def view_title(view):
title = view["title"] + " " + ", ".join(extra_titles)
for fn in ubiquitary_filters:
- # Disable 'filename' filter, if WATO is disabled
- if fn == "filename" and not config.wato_enabled:
+ # Disable 'wato_folder' filter, if WATO is disabled or there is a single host view
+ if fn == "wato_folder" and (not config.wato_enabled or "host" in view["hide_filters"]):
continue
filt = multisite_filters[fn]
heading = filt.heading_info(tablename)
Module: check_mk
Branch: master
Commit: e1d9c42968da640bb0b5edd5506d932801072223
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1d9c42968da64…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Oct 4 16:26:53 2012 +0200
Updated bug entries #0574
---
.bugs/574 | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.bugs/574 b/.bugs/574
index 8485fed..3e0fe8e 100644
--- a/.bugs/574
+++ b/.bugs/574
@@ -1,10 +1,13 @@
Title: Usability: Focus handling in User & Contacts: Edit User
Component: wato
-State: open
+Class: feature
+State: done
Date: 2012-01-09 15:32:35
Targetversion: 1.2.0
-Class: feature
If you call the edit dialog it will put the focus on the user name field and highlight the whole text.
This is great when initially adding the user but causes unwanted overwriting of the user name when you're just updating it.
If called in edit mode, don't set focus.
+
+2012-10-04 16:26:44: changed state open -> done
+Full name is no longer focused when editing user
Module: check_mk
Branch: master
Commit: 94d12f3eb04842f2612102ab618bd939108706b9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94d12f3eb04842…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Oct 4 16:25:32 2012 +0200
Updated bug entries #0145, #0090, #0365
---
.bugs/145 | 8 ++++++--
.bugs/365 | 8 ++++++--
.bugs/90 | 8 ++++++--
3 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/.bugs/145 b/.bugs/145
index e0b6f0e..20960e2 100644
--- a/.bugs/145
+++ b/.bugs/145
@@ -1,8 +1,12 @@
Title: import files in conf.d/*.mk in sorted order
Component: core
-State: open
-Date: 2011-02-16 17:12:01
Class: feature
+State: done
+Date: 2011-02-16 17:12:01
+Targetversion: future
Simple do a sort() of the globbed files. That way users have a way
to force a certain order of execution. And write that into the documentation.
+
+2012-10-04 16:25:08: changed state open -> done
+Has been implemented a long time ago...
diff --git a/.bugs/365 b/.bugs/365
index 2dbb5db..010710e 100644
--- a/.bugs/365
+++ b/.bugs/365
@@ -1,8 +1,12 @@
Title: Windows agent: make sections disableable by config
Component: checks
-State: open
-Date: 2011-09-07 17:35:51
Class: feature
+State: done
+Date: 2011-09-07 17:35:51
+Targetversion: future
It would be nice if the configuration of the windows agent would allow
to disable certain sections, e.g. logwatch.
+
+2012-10-04 16:23:50: changed state open -> done
+Has already been implemented.
diff --git a/.bugs/90 b/.bugs/90
index a410248..04b26ba 100644
--- a/.bugs/90
+++ b/.bugs/90
@@ -1,8 +1,12 @@
Title: Make topics in views snapin foldable
Component: multisite
-State: open
-Date: 2011-01-08 16:50:52
Class: feature
+State: done
+Date: 2011-01-08 16:50:52
+Targetversion: future
Make the topics foldable like in the custom links snapin. The
folding state should be persistet on a per user basis.
+
+2012-10-04 16:11:33: changed state open -> done
+Is already implemented