Checkmk git commits May 2012

checkmk-commits@lists.checkmk.com

2 participants
440 discussions

Check_MK Git: check_mk: FIX checkbox filters not effective on commands

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 771571b4dabee9678176c53e496a216095087516 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=771571b4dabee9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 20:14:35 2012 +0200 FIX checkbox filters not effective on commands --- .bugs/756 | 8 ++++++-- ChangeLog | 2 ++ web/htdocs/htmllib.py | 5 ++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.bugs/756 b/.bugs/756 index 36ed93d..6e59fe2 100644 --- a/.bugs/756 +++ b/.bugs/756 @@ -1,9 +1,9 @@ Title: Filter settings containing checkboxes get unset when issuing commands Component: multisite -State: open +Class: bug +State: done Date: 2012-05-24 19:55:24 Targetversion: 1.2.0 -Class: bug Open a view, open the filter, deselect "OK" state, save -> you get less services. No click on commands and issue the command. @@ -11,3 +11,7 @@ The filter will be ignored. Reason: the filled_in HTML variable, that is used by get_checkbox() is now not longer "filter", but "commands". + +2012-05-24 20:13:52: changed state open -> done +This now works. Hope that my fix didn't break anything else. +Watch of for dialogs with checkboxes.... diff --git a/ChangeLog b/ChangeLog index d3edd77..6effb00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -36,6 +36,8 @@ * FIX: fix sometimes-broken sizing of sidebar and dashboard on Chrome * FIX: fix dashboard layout on iPad * FIX: Fixed styling issues of sidebar in IE7 + * FIX: fix problem where filter settings (of checkboxes) are not effective + when it comes to executing commands Mobile: * FIX: Fixed logtime filter settings in all mobile views diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 13d12c4..f802712 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -321,8 +321,7 @@ class html: else: # add *all* get variables, that are not set by any input! for var, value in self.req.vars.items(): if var not in self.form_vars and \ - (var[0] != "_" or add_action_vars) and \ - var != "filled_in": + (var[0] != "_" or add_action_vars): # and var != "filled_in": self.hidden_field(var, value) def add_global_vars(self, varnames): @@ -635,7 +634,7 @@ class html: def form_filled_in(self): return self.has_var("filled_in") and ( self.form_name == None or \ - self.var("filled_in") == self.form_name) + self.form_name in self.list_var("filled_in")) # Get value of checkbox. Return True, False or None. None means

12 years, 1 month

Check_MK Git: check_mk: Reduce margins in command form

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 74cd16dac32f43bf38230fa88009bc6ff7430e97 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=74cd16dac32f43… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 20:00:08 2012 +0200 Reduce margins in command form --- .bugs/756 | 13 +++++++++++++ web/htdocs/views.css | 8 ++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/.bugs/756 b/.bugs/756 new file mode 100644 index 0000000..36ed93d --- /dev/null +++ b/.bugs/756 @@ -0,0 +1,13 @@ +Title: Filter settings containing checkboxes get unset when issuing commands +Component: multisite +State: open +Date: 2012-05-24 19:55:24 +Targetversion: 1.2.0 +Class: bug + +Open a view, open the filter, deselect "OK" state, save -> you +get less services. No click on commands and issue the command. +The filter will be ignored. + +Reason: the filled_in HTML variable, that is used by get_checkbox() +is now not longer "filter", but "commands". diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 7500e1d..b62b405 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -207,7 +207,15 @@ div.optiondial.refresh.off { background-image: url("images/dial_refresh_off.png" div.view_form { margin-bottom: 10px; } + +#commands table.nform td.legend { + height: 18px; +} +#commands table.nform td.content { + height: 18px; + padding-bottom: 2px; +} /*-------------------------------------------------------------------------. | _ _ |

12 years, 1 month

Check_MK Git: check_mk: Fixed text color in filters

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: cc250f8af16f01be09d5e994c58691eb10ff3f4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc250f8af16f01… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 19:53:17 2012 +0200 Fixed text color in filters --- web/htdocs/views.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/views.css b/web/htdocs/views.css index a8acfe0..7500e1d 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -65,6 +65,7 @@ div.floatfilter { background-image: url("images/nform_background.png"); background-repeat: repeat; border-radius: 5px; + color: black; } div.floatfilter.double {

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0755

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e4a94c6a2ec7d74376ead641b893d2d3c7d02b20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e4a94c6a2ec7d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 19:51:39 2012 +0200 Updated bug entries #0755 --- .bugs/755 | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/.bugs/755 b/.bugs/755 new file mode 100644 index 0000000..f799cee --- /dev/null +++ b/.bugs/755 @@ -0,0 +1,21 @@ +Title: Implement locking in WATO +Component: wato +State: open +Date: 2012-05-24 19:49:08 +Targetversion: 1.2.0 +Class: bug + +We need to prevent multiple users using WATO at the same time +getting into conflict. This should be done in the following way: + +[1] All action-URLs will do an exclusive locking including a + waiting for the lock + +[2] When activating changes we have a look into the pending + log. When there are changes of another user then we + print a warning and confirmation message, that foreign + changes are going to be activated. + +[3] Activating foreign changes will need a special permission. + +Still people need to make sure that the use personalized logins.

12 years, 1 month

Check_MK Git: check_mk: Fixed color of progress dialog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4919ac92ab9583d331b286609764146566ecdde2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4919ac92ab9583… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 19:44:12 2012 +0200 Fixed color of progress dialog --- web/htdocs/wato.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index acc3f0c..8ddadd4 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -829,6 +829,7 @@ div.varname { background-repeat: repeat; width: 50%; border: 1px solid #000; + color: black; } .wato table.progress th {

12 years, 1 month

Check_MK Git: check_mk: Style change in select boxes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 6c69775886754f9c59e60588a05d264701df11d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c69775886754f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 19:34:50 2012 +0200 Style change in select boxes --- web/htdocs/pages.css | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/pages.css b/web/htdocs/pages.css index 7b40bd1..b9559b3 100644 --- a/web/htdocs/pages.css +++ b/web/htdocs/pages.css @@ -403,6 +403,7 @@ select { border-style: solid none; border-width: 2px; border-color: white; + box-shadow: 0.5px 0.5px 1px #CCCCCC; } input[type=radio] {

12 years, 1 month

Check_MK Git: check_mk: D/WATO: replicate auth.secret

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 40db75afd4a12e78288894a55093ced96935e81a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=40db75afd4a12e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 19:35:47 2012 +0200 D/WATO: replicate auth.secret --- .bugs/747 | 7 +++++-- ChangeLog | 2 ++ web/htdocs/wato.py | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.bugs/747 b/.bugs/747 index b2f83b2..3a470bd 100644 --- a/.bugs/747 +++ b/.bugs/747 @@ -1,12 +1,15 @@ Title: Replication must replicate auth.secret Component: wato -State: open +Class: bug +State: done Date: 2012-05-11 18:00:47 Targetversion: 1.2.0 -Class: bug The replication must not only ship htpasswd, but also auth.secret. Otherwise a single-singon to the remote sites will not work. This is not only needed for addons like PNP, but also for internal web services like that for L4m. + +2012-05-24 19:35:04: changed state open -> done +Is now replicated. diff --git a/ChangeLog b/ChangeLog index 2d37894..d3edd77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,6 +14,8 @@ * FIX: Site management: replication setting was lost after re-editing * FIX: fixed problems after changing D/WATO-configuration * FIX: D/WATO: mark site dirty after host deletion + * FIX: D/WATO: replicate auth.secret, so that login on one site also + is valid on the replication slaves Multisite: * New display type 'boxes-omit-root' for BI views diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 0800979..a602e75 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -133,12 +133,14 @@ replication_paths = [ ( "dir", "check_mk", root_dir ), ( "dir", "multisite", multisite_dir ), ( "file", "htpasswd", defaults.htpasswd_file ), + ( "file", "auth.secret", '%s/auth.secret' % os.path.dirname(defaults.htpasswd_file) ), # Also replicate the user-settings of Multisite? While the replication # as such works pretty well, the count of pending changes will not # know. ( "dir", "usersettings", defaults.var_dir + "/web" ), ] + # Directories and files for backup & restore backup_paths = replication_paths + [ ( "file", "sites", sites_mk)

12 years, 1 month

Check_MK Git: check_mk: Fixed distance of sidebar snapins

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: ff68617d1a471cce6eee0e44868a5194bfecda5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff68617d1a471c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu May 24 19:13:59 2012 +0200 Fixed distance of sidebar snapins --- web/htdocs/sidebar.css | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/htdocs/sidebar.css b/web/htdocs/sidebar.css index a5a2ee4..18b9372 100644 --- a/web/htdocs/sidebar.css +++ b/web/htdocs/sidebar.css @@ -136,7 +136,7 @@ div.snapin div.head { width: 260px; text-align: center; color: #fff; - height: 25px; + height: 26px; line-height: 29px; } @@ -198,8 +198,8 @@ div.snapin div.foot { background-image: url("images/snapin_footer.png"); background-repeat: no-repeat; width: 260px; - height: 10px; - line-height: 10px; + height: 5px; + line-height: 5px; } /*

12 years, 1 month

Check_MK Git: check_mk: Updated bug entries #0683, #0710

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0830d07b5d802c75c442a555322df89da308c4bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0830d07b5d802c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 19:05:05 2012 +0200 Updated bug entries #0683, #0710 --- .bugs/683 | 7 +++++-- .bugs/710 | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.bugs/683 b/.bugs/683 index b0b7fc2..a5d0426 100644 --- a/.bugs/683 +++ b/.bugs/683 @@ -1,8 +1,11 @@ Title: Checkboxes (Multiselect) not working on IE Component: multisite -State: open +Class: bug +State: works4me Date: 2012-05-08 16:20:24 Targetversion: 1.2.0 -Class: bug Seems to be in WATO and also in Multisite views + +2012-05-24 18:26:37: changed state open -> works4me +Works for me in ie7, 8, 9 diff --git a/.bugs/710 b/.bugs/710 index ca80f29..1ba7083 100644 --- a/.bugs/710 +++ b/.bugs/710 @@ -1,9 +1,12 @@ Title: Bulk inventory hangs if no hosts selected Component: wato -State: open +Class: bug +State: works4me Date: 2012-05-11 17:54:23 Targetversion: 1.2.0 -Class: bug If bulk inventory is launched and finds no hosts to inventorize, the menu hangs forever. + +2012-05-24 18:42:20: changed state open -> works4me +I can not reproduce a problem.

12 years, 1 month

Check_MK Git: check_mk: Fixed fix from today ( checkboxes in views work again)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: f22bd425f76ba1810659b916b2b637cb42f10527 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f22bd425f76ba1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu May 24 18:24:49 2012 +0200 Fixed fix from today (checkboxes in views work again) --- .bugs/750 | 7 +++++-- web/htdocs/views.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.bugs/750 b/.bugs/750 index c5cc8fe..7d9df0c 100644 --- a/.bugs/750 +++ b/.bugs/750 @@ -1,9 +1,12 @@ Title: IE8: Sidebarscrolling garbles layout Component: multisite -State: open +Class: bug +State: done Date: 2012-05-15 09:16:40 Targetversion: 1.2.0 -Class: bug If you scroll the sidebar up and down on IE8 then some things do not scroll but seem to be fixed to the screen. + +2012-05-24 18:16:35: changed state open -> done +Has been fixed. Never use position: relative within snapins diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 13fc8c0..f1c189d 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1302,7 +1302,7 @@ def render_view(view, rows, datasource, group_painters, painters, should_show_command_form(display_options, datasource) show_context_links(view, hide_filters, show_filters, display_options, - painter_options, command_form, show_checkboxes) + painter_options, command_form, layout.get('checkboxes', False)) # User errors in filters html.show_user_errors()

12 years, 1 month

← Newer
1
...
10
11
12
13
14
15
16
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2012