Module: check_mk
Branch: master
Commit: 334369b8b29c86d16e9c7ab8bf5dc6d5aec2139a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=334369b8b29c86…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Dec 16 10:36:01 2011 +0100
FIX: Fixed duplicate view plugin loading when using localized multisite
---
ChangeLog | 1 +
web/htdocs/views.py | 21 +++++++++++----------
web/plugins/views/commands.py | 3 +++
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3a514bc..6e84116 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@
* New (hidden) button for reloading a snapin (left to the close button)
* Automatically falling back to hardcoded default language if configured
language is not available
+ * FIX: Fixed duplicate view plugin loading when using localized multisite
BI:
* Host/Service elements are now iterable via FOREACH_HOST, e.g.
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index f91b7df..fc41ac7 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -41,16 +41,6 @@ except NameError:
# Datastructures and functions needed before plugins can be loaded
loaded_with_language = False
-multisite_datasources = {}
-multisite_filters = {}
-multisite_layouts = {}
-multisite_painters = {}
-multisite_sorters = {}
-multisite_builtin_views = {}
-multisite_painter_options = {}
-multisite_commands = []
-ubiquitary_filters = [] # Always show this filters
-view_hooks = {}
# Load all view plugins
def load_plugins():
@@ -59,6 +49,17 @@ def load_plugins():
return
loaded_with_language = current_language
+ global multisite_datasources ; multisite_datasources = {}
+ global multisite_filters ; multisite_filters = {}
+ global multisite_layouts ; multisite_layouts = {}
+ global multisite_painters ; multisite_painters = {}
+ global multisite_sorters ; multisite_sorters = {}
+ global multisite_builtin_views ; multisite_builtin_views = {}
+ global multisite_painter_options ; multisite_painter_options = {}
+ global multisite_commands ; multisite_commands = []
+ global ubiquitary_filters ; ubiquitary_filters = [] # Always show this
filters
+ global view_hooks ; view_hooks = {}
+
config.declare_permission_section("action", _("Commands on host and
services"))
load_web_plugins("views", globals())
diff --git a/web/plugins/views/commands.py b/web/plugins/views/commands.py
index 039ad47..eaac3b1 100644
--- a/web/plugins/views/commands.py
+++ b/web/plugins/views/commands.py
@@ -36,6 +36,9 @@
# - function that outputs the HTML input fields
# - function that creates the nagios command and title
+#import datetime, traceback
+#file('/tmp/1', 'a').write('%s %s\n%s' %
(datetime.datetime.now(), current_language, ''.join(traceback.format_stack())))
+
# RESCHEDULE ACTIVE CHECKS
config.declare_permission("action.reschedule",
_("Reschedule checks"),