diff --git a/collection/models.py b/collection/models.py index 004cff36..6f4c512c 100644 --- a/collection/models.py +++ b/collection/models.py @@ -20,7 +20,7 @@ class Collection(UserOwnedEntity): cover = models.ImageField(_("封面"), upload_to=collection_cover_path, default=settings.DEFAULT_COLLECTION_IMAGE, blank=True) def __str__(self): - return str(self.owner) + ': ' + self.name + return str(self.owner) + ': ' + self.title @property def collectionitem_list(self): diff --git a/collection/templates/delete.html b/collection/templates/delete.html new file mode 100644 index 00000000..c170540e --- /dev/null +++ b/collection/templates/delete.html @@ -0,0 +1,123 @@ +{% load static %} +{% load i18n %} +{% load l10n %} +{% load humanize %} +{% load admin_url %} +{% load mastodon %} +{% load oauth_token %} +{% load truncate %} +{% load thumb %} + + + + + + + + + + + + + {{ site_name }} {% trans '收藏单' %} - {{ collection.title }} + + + + + + + + + +
+
+ {% include "partial/_navbar.html" %} + +
+
+
+
+
+
+ 确认删除收藏单「{{ collection.title }}」吗？ +
+ {% if collection.visibility > 0 %} + + + + {% endif %} +
+
+ + {{ collection.owner.mastodon_username }} + + + {{ collection.edited_time }} + +
+
+
+
+
+ {{ form.description }} +
+ {{ form.media }} +
+
+
+ {% csrf_token %} + +
+ +
+ + +
+
+
+
+
+
+
+ + + +
+
+
+ + {{ collection.title }} + +
+
+
+
+
+
+
+
+ {% include "partial/_footer.html" %} +
+ + + {% comment %} + + + + + {% endcomment %} + + + + + + diff --git a/collection/views.py b/collection/views.py index 08d2344e..2cf740aa 100644 --- a/collection/views.py +++ b/collection/views.py @@ -198,26 +198,24 @@ def retrieve_entity_list(request, id): ) -@permission_required("collections.delete_collection") @login_required def delete(request, id): collection = get_object_or_404(Collection, pk=id) - if request.method == 'GET': - return render( - request, - 'collections/delete.html', - { - 'collection': collection, - } - ) - elif request.method == 'POST': - if request.user.is_staff or request.user == collection.owner: + if request.user.is_staff or request.user == collection.owner: + if request.method == 'GET': + return render( + request, + 'delete.html', + { + 'collection': collection, + 'form': CollectionForm(instance=collection) + } + ) + elif request.method == 'POST': collection.delete() return redirect(reverse("common:home")) - else: - raise PermissionDenied() else: - return HttpResponseBadRequest() + raise PermissionDenied() @login_required