Skip to content
Open

V2.1 #662

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion suit/admin.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.contrib import admin
from django.db import models
from django.core.urlresolvers import reverse_lazy
from django.urls import reverse_lazy

"""
Adapted by using following examples:
Expand Down
2 changes: 1 addition & 1 deletion suit/menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ def handle_user_url(self, menu_item):
return menu_item
if '/' in menu_item.url:
return menu_item
from django.core.urlresolvers import reverse, NoReverseMatch
from django.urls import reverse, NoReverseMatch
try:
menu_item.url = reverse(menu_item.url, current_app=self.current_app)
menu_item._url_name = menu_item.url
Expand Down
2 changes: 1 addition & 1 deletion suit/templatetags/suit_forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def suit_form_field_widget_class(field):
return ''


@register.assignment_tag(takes_context=True)
@register.simple_tag(takes_context=True)
def suit_form_conf(context, param_name, inline_admin_formset=None):
"""
Get form config param
Expand Down
4 changes: 2 additions & 2 deletions suit/templatetags/suit_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
from django import template
from django.contrib.admin import AdminSite
from django.http import HttpRequest
from django.core.urlresolvers import reverse, resolve
from django.urls import reverse, resolve
from suit.menu import MenuManager

register = template.Library()


@register.assignment_tag(takes_context=True)
@register.simple_tag(takes_context=True)
def get_menu(context, request):
"""
:type request: WSGIRequest
Expand Down
2 changes: 1 addition & 1 deletion suit/templatetags/suit_tags.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def suit_body_class(value, request):
return ' '.join(css_classes)


@register.assignment_tag
@register.simple_tag
def suit_conf_value(name, model_admin=None):
if model_admin:
value_by_ma = getattr(model_admin, 'suit_%s' % name.lower(), None)
Expand Down