nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

menu: Lazily reverse menu item URLs

Browse Source 
To allow for more flexibility in menu management with respect to Django
initialization.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
Sunil Mohan Adapa 2017-04-06 15:23:25 +05:30 committed by James Valleroy
parent dd196c504d
commit 184bced823
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plinth/menu.py
View File

@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
from django.urls import reverse from django.urls import reverse, reverse_lazy
class Menu(object): class Menu(object):
@ -51,7 +51,7 @@ class Menu(object):
"""Return a menu item with given URL name.""" """Return a menu item with given URL name."""
url = reverse(urlname, args=url_args, kwargs=url_kwargs) url = reverse(urlname, args=url_args, kwargs=url_kwargs)
for item in self.items: for item in self.items:
if item.url == url: if str(item.url) == url:
return item return item
raise KeyError('Menu item not found') raise KeyError('Menu item not found')
@ -67,7 +67,7 @@ class Menu(object):
url_args and url_kwargs will be passed on to Django reverse(). url_args and url_kwargs will be passed on to Django reverse().
""" """
url = reverse(urlname, args=url_args, kwargs=url_kwargs) url = reverse_lazy(urlname, args=url_args, kwargs=url_kwargs)
return self.add_item(label, icon, url, order) return self.add_item(label, icon, url, order)
def add_item(self, label, icon, url, order=50): def add_item(self, label, icon, url, order=50):
@ -82,5 +82,5 @@ class Menu(object):
def active_item(self, request): def active_item(self, request):
"""Return the first active item (e.g. submenu) that is found.""" """Return the first active item (e.g. submenu) that is found."""
for item in self.items: for item in self.items:
if request.path.startswith(item.url): if request.path.startswith(str(item.url)):
return item return item