Module: check_mk
Branch: master
Commit: eaf92f6f3fc0e0a0bce3ecc9efb5516f925f5598
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eaf92f6f3fc0e0…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Jan 9 16:10:49 2013 +0100
FIX: Fixed rendering of dashboard globes in opera
---
.bugs/594 | 7 +++++--
.bugs/679 | 7 +++++--
.bugs/715 | 8 +++++++-
ChangeLog | 1 +
web/htdocs/dashboard.py | 12 +++++++-----
web/htdocs/default_permissions.py | 4 ++--
6 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/.bugs/594 b/.bugs/594
index d5aba64..d296360 100644
--- a/.bugs/594
+++ b/.bugs/594
@@ -1,9 +1,9 @@
Title: CPU Utilization immer auf 100% bei -nv (Windows)
Component: core
-State: open
+Class: nastiness
+State: done
Date: 2012-01-10 17:58:52
Targetversion: 1.2.2
-Class: nastiness
Windows Hosts zeigen bei einem cmk -nv immer eine CPU Utilization von 100% an.
Der Normale Check funktioniert. Tritt hier bei 1.1.13i2 auf.
@@ -11,3 +11,6 @@ Der Normale Check funktioniert. Tritt hier bei 1.1.13i2 auf.
Grund: der Check arbeitet mit Countern. Sollte aber trotzdem machbar sein,
dass er funktioniert, wenn schon von früher Werte da sind. Bei erstenmal
sollte der Check pending sein (analog zu disk IO).
+
+2013-01-09 15:32:54: changed state open -> done
+Correct percentage calciulation for this situation has been added.
diff --git a/.bugs/679 b/.bugs/679
index c885493..4cff354 100644
--- a/.bugs/679
+++ b/.bugs/679
@@ -1,9 +1,9 @@
Title: Logwatch ruleeditor (or ValueSpec ListOf) breaks on Iceweasel on Debian 6.0
Component: multisite
-State: open
+Class: bug
+State: done
Date: 2012-04-24 12:07:14
Targetversion: 1.2.2
-Class: bug
On Iceweasel 3.5.16 the rule editor breaks while editing ListOf()
in the logwatch pattern editor. When adding a line, the layout
@@ -28,3 +28,6 @@ Traceback (most recent call last):
ValueError: invalid literal for int() with base 10: ''
It also looks that the pickling does not work on this browser.
+
+2013-01-09 15:35:31: changed state open -> done
+This has already been fixed in the past
diff --git a/.bugs/715 b/.bugs/715
index 2e00d94..83ad1ee 100644
--- a/.bugs/715
+++ b/.bugs/715
@@ -1,6 +1,6 @@
Title: WATO permission "edit views" = False disables display of custom views
Component: wato
-State: open
+State: done
Date: 2012-07-06 14:16:42
Targetversion: 1.2.2
Class: bug
@@ -11,3 +11,9 @@ possible to still use that were "installed" on setup.
Resolution: we simply rename the permission into "Allow creating and using
own customized views"
+
+2013-01-09 15:38:55: changed state open -> done
+Has just been renamed.
+
+2013-01-09 16:10:01: changed state done -> done
+Changed calculation algorithm.
diff --git a/ChangeLog b/ChangeLog
index 778c06e..132fab0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -82,6 +82,7 @@
* FIX: Dashboard: Fixed wrong display options in links after data reloads
* FIX: Fixed "remove all downtimes" button in views when no downtimes to be
deleted
* FIX: Services in hosttables now use the service name as header (if no custom title
set)
+ * FIX: Fixed rendering of dashboard globes in opera
* New filter for host_contact and service_contact
WATO:
diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py
index 7587ccf..eeadd49 100644
--- a/web/htdocs/dashboard.py
+++ b/web/htdocs/dashboard.py
@@ -605,8 +605,8 @@ def render_statistics(pie_id, what, table, filter):
# compute radius of this sphere *including all inner spheres!* The first
# sphere always gets a radius of 1.0, of course.
radius = remaining_separatorspace + remaining_radius * (remaining_part **
(1/3.0))
- pie_parts.append('chart_pie("%s", %f, %f, %r);' %
(pie_id, pie_right_aspect, radius, color))
- pie_parts.append('chart_pie("%s", -%f, %f, %r);' %
(pie_id, pie_left_aspect, radius, color))
+ pie_parts.append('chart_pie("%s", %f, %f, %r, true);' %
(pie_id, pie_right_aspect, radius, color))
+ pie_parts.append('chart_pie("%s", %f, %f, %r, false);'
% (pie_id, pie_left_aspect, radius, color))
# compute relative part of this class
part = float(value) / total # ranges from 0 to 1
@@ -616,7 +616,7 @@ def render_statistics(pie_id, what, table, filter):
html.write("</div>")
html.javascript("""
-function chart_pie(pie_id, x_scale, radius, color) {
+function chart_pie(pie_id, x_scale, radius, color, right_side) {
var context = document.getElementById(pie_id +
"_stats").getContext('2d');
if (!context)
return;
@@ -628,8 +628,10 @@ function chart_pie(pie_id, x_scale, radius, color) {
context.translate(pie_x, pie_y);
context.scale(x_scale, 1);
context.beginPath();
- context.moveTo(0, 0);
- context.arc(0, 0, (pie_d / 2) * radius, 1.5 * Math.PI, 0.5 * Math.PI, false);
+ if(right_side)
+ context.arc(0, 0, (pie_d / 2) * radius, 1.5 * Math.PI, 0.5 * Math.PI, false);
+ else
+ context.arc(0, 0, (pie_d / 2) * radius, 0.5 * Math.PI, 1.5 * Math.PI, false);
context.closePath();
context.fill();
context.restore();
diff --git a/web/htdocs/default_permissions.py b/web/htdocs/default_permissions.py
index c4a49b2..33f4587 100644
--- a/web/htdocs/default_permissions.py
+++ b/web/htdocs/default_permissions.py
@@ -58,8 +58,8 @@ def load():
[ "admin", "guest" ])
config.declare_permission("general.edit_views",
- _("Edit views"),
- _("Create own views and customize builtin views"),
+ _("Customize views and use them"),
+ _("Allows to create own views, customize builtin views and use
them."),
[ "admin", "user" ])
config.declare_permission("general.publish_views",