Module: check_mk
Branch: master
Commit: f547ceb59ede72497d9fffecb487791fc0e39350
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f547ceb59ede72…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu May 24 20:10:16 2012 +0200
Updated bug entries #0752
---
.bugs/752 | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/.bugs/752 b/.bugs/752
index 1969811..6eff41d 100644
--- a/.bugs/752
+++ b/.bugs/752
@@ -7,3 +7,10 @@ Class: bug
Only the right half of the actual data is being displayed.
Maybe Opera has problems with negative values somewhere.
+
+The right part is painted above the other one. The reason is that
+in opera the negative scale for flipping the thing does not work:
+
+context.scale(x_scale, 1);
+
+Maybe simply draw the figure vice versa instead of flipping it after drawing?
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
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.
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)