entrouvert
/
hobo
16
0
Fork 0
Code Issues Pull Requests 15 Releases Activity

misc: use publik-base-theme for portal agent (#30334)

This commit is contained in:
Frédéric Péters 2019-02-03 15:34:44 +01:00
parent 37f7dff960
commit f079e95570
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hobo/agent/combo/management/commands/hobo_deploy.py
View File

@ -8,6 +8,4 @@ class Command(hobo_deploy.Command):
me = [x for x in hobo_environment.get('services') if x.get('this')][0]
except IndexError:
return
if me.get('template_name') == 'portal-agent':
return {'module': 'gadjo'}
return super(Command, self).get_theme(hobo_environment)

4
hobo/multitenant/settings_loaders.py
View File

@ -125,6 +125,7 @@ class TemplateVars(FileBaseSettingsLoader):
@classmethod
def get_hobo_json_variables(cls, hobo_json):
variables = hobo_json.get('variables', {})
variables['is_portal_agent'] = False
for service in hobo_json.get('services'):
if not service.get('slug'):
continue
@ -150,6 +151,9 @@ class TemplateVars(FileBaseSettingsLoader):
variables.update(service.get('variables') or {})
variables['site_title'] = service.get('title')
if service.get('template_name') == 'portal-agent':
variables['is_portal_agent'] = True
if getattr(settings, 'HOBO_MANAGER_HOMEPAGE_TITLE_VAR', None):
variables['manager_homepage_title'] = \
variables.get(settings.HOBO_MANAGER_HOMEPAGE_TITLE_VAR)

4
hobo/multitenant/template_loader.py
View File

@ -64,7 +64,9 @@ class FilesystemLoader(DjangoFilesystemLoader):
known_dirnames = ['templates', 'theme/templates']
known_template_names = [template_name]
if hasattr(settings, 'TEMPLATE_VARS') and settings.TEMPLATE_VARS.get('theme'):
if hasattr(settings, 'TEMPLATE_VARS') and settings.TEMPLATE_VARS.get('is_portal_agent'):
known_template_names = ['portal-agent/%s' % template_name, template_name]
elif hasattr(settings, 'TEMPLATE_VARS') and settings.TEMPLATE_VARS.get('theme'):
theme_value = settings.TEMPLATE_VARS['theme']
known_template_names = ['variants/%s/%s' % (theme_value, template_name), template_name]