~netlandish/django-wiki

2f3e13c64156d467cadb8ba15ecdbb44aa6aaa2a — Benjamin Bach 6 years ago 2c1420d + 966a4a6
Merge pull request #791 from rsalmaso/simple_tag

Use simple_tag as assigned_tag is removed
M src/wiki/plugins/macros/templatetags/wiki_macro_tags.py => src/wiki/plugins/macros/templatetags/wiki_macro_tags.py +1 -1
@@ 15,7 15,7 @@ def article_list(context, urlpath, depth):
    return context


@register.assignment_tag
@register.simple_tag
def allowed_macros():
    for method in settings.METHODS:
        try:

M src/wiki/templatetags/wiki_tags.py => src/wiki/templatetags/wiki_tags.py +2 -2
@@ 22,7 22,7 @@ register = template.Library()
_cache = {}


@register.assignment_tag(takes_context=True)
@register.simple_tag(takes_context=True)
def article_for_object(context, obj):
    if not isinstance(obj, Model):
        raise TypeError(


@@ 186,7 186,7 @@ def is_locked(model):
    return (model.current_revision and model.current_revision.locked)


@register.assignment_tag(takes_context=True)
@register.simple_tag(takes_context=True)
def login_url(context):
    request = context['request']
    qs = request.META.get('QUERY_STRING', '')