entrouvert
/
authentic
16
0
Fork 0
Code Issues Pull Requests 33 Releases Activity

Do not pass homepage url through settings, use variables set in the template context by a template context processor (refs #6690)

This commit is contained in:
Benjamin Dauvergne 2015-03-13 12:05:12 +01:00
parent f41a12ba9a
commit 7a9423e6ed
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/authentic2/manager/app_settings.py
View File

@ -3,29 +3,9 @@ import sys
class AppSettings(object):
__PREFIX = 'A2_MANAGER_'
__DEFAULTS = {
'HOMEPAGE_URL': None,
'HOMEPAGE_TITLE': None,
'LOGOUT_URL': None,
}
@property
def HOMEPAGE_URL(self):
from django.conf import settings
return getattr(settings,
'%sHOMEPAGE_URL' % self.__PREFIX,
getattr(settings,
'MANAGER_HOMEPAGE_URL',
self.__DEFAULTS['HOMEPAGE_URL']))
@property
def HOMEPAGE_TITLE(self):
from django.conf import settings
return getattr(settings,
'%sHOMEPAGE_TITLE' % self.__PREFIX,
getattr(settings,
'MANAGER_HOMEPAGE_TITLE',
self.__DEFAULTS['HOMEPAGE_URL']))
def __getattr__(self, name):
from django.conf import settings
if name not in self.__DEFAULTS:

4
src/authentic2/manager/templates/authentic2/manager/base.html
View File

@ -22,8 +22,8 @@
</script>
{% endblock %}
{% block homepage-url %}{{ homepage_url }}{% endblock %}
{% block homepage-title %}{% trans "Management" as default_homepage_title %}{% firstof homepage_title default_homepage_title %}{% endblock %}
{% block homepage-url %}{% url 'a2-manager-homepage' as default_homepage_url %}{% firstof manager_homepage_url default_homepage_url %}{% endblock %}
{% block homepage-title %}{% trans "Management" as default_homepage_title %}{% firstof manager_homepage_title default_homepage_title %}{% endblock %}
{% block logout-url %}{{ logout_url }}{% endblock %}

2
src/authentic2/manager/views.py
View File

@ -35,8 +35,6 @@ class Action(object):
class ManagerMixin(object):
def get_context_data(self, **kwargs):
ctx = super(ManagerMixin, self).get_context_data(**kwargs)
ctx['homepage_url'] = app_settings.HOMEPAGE_URL or reverse('auth_homepage')
ctx['homepage_title'] = app_settings.HOMEPAGE_TITLE
ctx['logout_url'] = app_settings.LOGOUT_URL or reverse('auth_logout')
return ctx