From 9620fc5a83ab0daf84fa9a7f8b6982723dc763dc Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 20 Aug 2020 17:51:00 -0500 Subject: [PATCH] Add config for "global" help URL --- tailbone/config.py | 6 ++++++ tailbone/views/common.py | 2 ++ tailbone/views/master.py | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/tailbone/config.py b/tailbone/config.py index ebd8899e..29359e06 100644 --- a/tailbone/config.py +++ b/tailbone/config.py @@ -53,9 +53,15 @@ class ConfigExtension(BaseExtension): config.setdefault('tailbone', 'themes.expose_picker', 'true') +def global_help_url(config): + return config.get('tailbone', 'global_help_url') + + def legacy_mobile_enabled(config): return config.getbool('tailbone', 'legacy_mobile.enabled', default=True) + def protected_usernames(config): return config.getlist('tailbone', 'protected_usernames') + diff --git a/tailbone/views/common.py b/tailbone/views/common.py index 1ceb9e3f..39e938b6 100644 --- a/tailbone/views/common.py +++ b/tailbone/views/common.py @@ -44,6 +44,7 @@ from tailbone.forms.common import Feedback from tailbone.db import Session from tailbone.views import View from tailbone.util import set_app_theme +from tailbone.config import global_help_url class CommonView(View): @@ -69,6 +70,7 @@ class CommonView(View): context = { 'image_url': image_url, 'use_buefy': self.get_use_buefy(), + 'help_url': global_help_url(self.rattail_config), } if self.expose_quickie_search: diff --git a/tailbone/views/master.py b/tailbone/views/master.py index 827e5500..4210f62e 100644 --- a/tailbone/views/master.py +++ b/tailbone/views/master.py @@ -58,6 +58,7 @@ from webhelpers2.html import HTML, tags from tailbone import forms, grids, diffs from tailbone.views import View +from tailbone.config import global_help_url log = logging.getLogger(__name__) @@ -2318,7 +2319,10 @@ class MasterView(View): so if you like you can return a different help URL depending on which type of CRUD view is in effect, etc. """ - return self.help_url + if self.help_url: + return self.help_url + + return global_help_url(self.rattail_config) def render_to_response(self, template, data, mobile=False): """