Module: check_mk
Branch: master
Commit: 912cbe1419ee29945fed7fba9029edc32492c37c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=912cbe1419ee29…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Wed Mar 14 14:20:14 2018 +0100
Updated latest werk
Change-Id: I84866b5227da87eccc99aa2e3f216a2d311640c8
---
.werks/5904 | 2 +-
web/htdocs/views.py | 13 ++++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/.werks/5904 b/.werks/5904
index b7efbda..665293a 100644
--- a/.werks/5904
+++ b/.werks/5904
@@ -1,4 +1,4 @@
-Title: Add view name to view permission help text
+Title: Add view name to view permission help text and mobile prefix for mobile views
Level: 1
Component: multisite
Compatible: compat
diff --git a/web/htdocs/views.py b/web/htdocs/views.py
index 5f15c0d..8a46903 100644
--- a/web/htdocs/views.py
+++ b/web/htdocs/views.py
@@ -74,7 +74,7 @@ def load_plugins(force):
config.declare_permission_section("view", _("Multisite Views"),
do_sort = True)
for name, view in multisite_builtin_views.items():
config.declare_permission("view.%s" % name,
- _u(view["title"]),
+ format_view_title(view),
"%s - %s" % (name, _u(view["description"])),
config.builtin_role_ids)
@@ -1057,13 +1057,16 @@ def view_choices(only_with_hidden = False):
choices = [("", "")]
for name, view in available_views.items():
if not only_with_hidden or view['single_infos']:
- if view.get('mobile', False):
- title = _('Mobile: ') + _u(view["title"])
- else:
- title = _u(view["title"])
+ title = format_view_title(view)
choices.append(("%s" % name, title))
return choices
+def format_view_title(view):
+ if view.get('mobile', False):
+ return _('Mobile: ') + _u(view["title"])
+ else:
+ return _u(view["title"])
+
def view_editor_options():
return [
('mobile', _('Show this view in the Mobile GUI')),