X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/5913c54d19b8f6775633176032161d49f9b2f1aa..ad2f309daa381e9a7a2b7a8a17ef494b60f838b2:/src/wiki_img/views.py diff --git a/src/wiki_img/views.py b/src/wiki_img/views.py index 2b8dd67e..280848a8 100644 --- a/src/wiki_img/views.py +++ b/src/wiki_img/views.py @@ -1,9 +1,12 @@ +# This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# import os import functools import logging logger = logging.getLogger("fnp.wiki_img") -from django.core.urlresolvers import reverse +from django.urls import reverse from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError, ajax_require_permission) @@ -63,7 +66,7 @@ def text(request, image_id): if request.method == 'POST': form = ImageSaveForm(request.POST, user=request.user, prefix="textsave") if form.is_valid(): - if request.user.is_authenticated(): + if request.user.is_authenticated: author = request.user else: author = None @@ -129,7 +132,7 @@ def history(request, object_id): "author": change.author_str(), "date": localize(change.created_at), "publishable": _("Publishable") + "\n" if change.publishable else "", - "tag": ',\n'.join(unicode(tag) for tag in change.tags.all()), + "tag": ',\n'.join(str(tag) for tag in change.tags.all()), }) return JSONResponse(changes) @@ -148,7 +151,7 @@ def revert(request, object_id): comment = form.cleaned_data['comment'] comment += "\n#revert to %s" % revision - if request.user.is_authenticated(): + if request.user.is_authenticated: author = request.user else: author = None