rescue/khaganat-web
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity

Quickfix for navbar export

Browse source
This commit is contained in:
Rodolphe Breard 2020-02-06 12:39:44 +01:00
parent 63c5d10911
commit 598c4ab59d
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navbar/models.py
View file

@ -39,7 +39,7 @@ class Element(models.Model):
def localized_link(self):
link = self.link
desc = self.description()
if desc.link_override:
if desc and desc.link_override:
link = desc.link_override
return link

5
navbar/templatetags/navbar.py
View file

@ -25,7 +25,10 @@ def get_lang_data(path_info, lang_code, curr_lang):
lang_name = get_lang_name(lang_code)
rm = resolve(path_info)
activate_lang(lang_code)
lang_url = reverse(rm.view_name, current_app="npb", args=rm.args, kwargs=rm.kwargs)
if path_info == "/":
lang_url = f"/{lang_code}/"
else:
lang_url = reverse(rm.view_name, current_app="npb", args=rm.args, kwargs=rm.kwargs)
activate_lang(curr_lang)
return (lang_code, lang_name, lang_url)