+
+ {% include "partial/_navbar.html" %}
+
+
+
+ {% include "partial/_footer.html" %}
+
+
+
+ {% comment %}
+
{% oauth_token %}
+
{% mastodon request.user.mastodon_site %}
+
+
{{ user.mastodon_id }}
+ {% endcomment %}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/collection/templates/detail.html b/collection/templates/detail.html
new file mode 100644
index 00000000..f20c9d43
--- /dev/null
+++ b/collection/templates/detail.html
@@ -0,0 +1,114 @@
+{% 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 %}
+
+
+
+ {{ form.description }}
+
+ {{ form.media }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {% include "partial/_footer.html" %}
+
+
+
+ {% comment %}
+
{% oauth_token %}
+
{% mastodon request.user.mastodon_site %}
+
+
{{ user.mastodon_id }}
+ {% endcomment %}
+
+
+
+
+
+
diff --git a/collection/views.py b/collection/views.py
index 89742b49..3dfc9729 100644
--- a/collection/views.py
+++ b/collection/views.py
@@ -41,14 +41,14 @@ TAG_NUMBER = 10
@login_required
def create(request):
if request.method == 'GET':
- form = GameForm()
+ form = CollectionForm()
return render(
request,
- 'games/create_update.html',
+ 'create_update.html',
{
'form': form,
- 'title': _('添加游戏'),
- 'submit_url': reverse("games:create"),
+ 'title': _('添加收藏单'),
+ 'submit_url': reverse("collection:create"),
# provided for frontend js
'this_site_enum_value': SourceSiteEnum.IN_SITE.value,
}
@@ -56,28 +56,25 @@ def create(request):
elif request.method == 'POST':
if request.user.is_authenticated:
# only local user can alter public data
- form = GameForm(request.POST, request.FILES)
+ form = CollectionForm(request.POST, request.FILES)
+ form.instance.owner = request.user
if form.is_valid():
form.instance.last_editor = request.user
try:
with transaction.atomic():
form.save()
- if form.instance.source_site == SourceSiteEnum.IN_SITE.value:
- real_url = form.instance.get_absolute_url()
- form.instance.source_url = real_url
- form.instance.save()
except IntegrityError as e:
logger.error(e.__str__())
return HttpResponseServerError("integrity error")
- return redirect(reverse("games:retrieve", args=[form.instance.id]))
+ return redirect(reverse("collection:retrieve", args=[form.instance.id]))
else:
return render(
request,
- 'games/create_update.html',
+ 'create_update.html',
{
'form': form,
- 'title': _('添加游戏'),
- 'submit_url': reverse("games:create"),
+ 'title': _('添加收藏單'),
+ 'submit_url': reverse("collection:create"),
# provided for frontend js
'this_site_enum_value': SourceSiteEnum.IN_SITE.value,
}
@@ -90,25 +87,25 @@ def create(request):
@login_required
def update(request, id):
+ page_title = _("修改游戏")
+ collection = get_object_or_404(Collection, pk=id)
+ if not collection.is_visible_to(request.user):
+ raise PermissionDenied()
if request.method == 'GET':
- game = get_object_or_404(Game, pk=id)
- form = GameForm(instance=game)
- page_title = _('修改游戏')
+ form = CollectionForm(instance=collection)
return render(
request,
- 'games/create_update.html',
+ 'create_update.html',
{
'form': form,
'title': page_title,
- 'submit_url': reverse("games:update", args=[game.id]),
+ 'submit_url': reverse("collection:update", args=[collection.id]),
# provided for frontend js
'this_site_enum_value': SourceSiteEnum.IN_SITE.value,
}
)
elif request.method == 'POST':
- game = get_object_or_404(Game, pk=id)
- form = GameForm(request.POST, request.FILES, instance=game)
- page_title = _("修改游戏")
+ form = CollectionForm(request.POST, request.FILES, instance=collection)
if form.is_valid():
form.instance.last_editor = request.user
form.instance.edited_time = timezone.now()
@@ -125,11 +122,11 @@ def update(request, id):
else:
return render(
request,
- 'games/create_update.html',
+ 'create_update.html',
{
'form': form,
'title': page_title,
- 'submit_url': reverse("games:update", args=[game.id]),
+ 'submit_url': reverse("collection:update", args=[collection.id]),
# provided for frontend js
'this_site_enum_value': SourceSiteEnum.IN_SITE.value,
}
@@ -144,82 +141,23 @@ def update(request, id):
# @login_required
def retrieve(request, id):
if request.method == 'GET':
- game = get_object_or_404(Game, pk=id)
- mark = None
- mark_tags = None
- review = None
+ collection = get_object_or_404(Collection, pk=id)
+ if not collection.is_visible_to(request.user):
+ raise PermissionDenied()
+ form = CollectionForm(instance=collection)
- # retreive tags
- game_tag_list = game.game_tags.values('content').annotate(
- tag_frequency=Count('content')).order_by('-tag_frequency')[:TAG_NUMBER]
-
- # retrieve user mark and initialize mark form
- try:
- if request.user.is_authenticated:
- mark = GameMark.objects.get(owner=request.user, game=game)
- except ObjectDoesNotExist:
- mark = None
- if mark:
- mark_tags = mark.gamemark_tags.all()
- mark.get_status_display = GameMarkStatusTranslator(mark.status)
- mark_form = GameMarkForm(instance=mark, initial={
- 'tags': mark_tags
- })
- else:
- mark_form = GameMarkForm(initial={
- 'game': game,
- 'tags': mark_tags
- })
-
- # retrieve user review
- try:
- if request.user.is_authenticated:
- review = GameReview.objects.get(
- owner=request.user, game=game)
- except ObjectDoesNotExist:
- review = None
-
- # retrieve other related reviews and marks
- if request.user.is_anonymous:
- # hide all marks and reviews for anonymous user
- mark_list = None
- review_list = None
- mark_list_more = None
- review_list_more = None
- else:
- mark_list = GameMark.get_available(game, request.user)
- review_list = GameReview.get_available(game, request.user)
- mark_list_more = True if len(mark_list) > MARK_NUMBER else False
- mark_list = mark_list[:MARK_NUMBER]
- for m in mark_list:
- m.get_status_display = GameMarkStatusTranslator(m.status)
- review_list_more = True if len(
- review_list) > REVIEW_NUMBER else False
- review_list = review_list[:REVIEW_NUMBER]
-
- # def strip_html_tags(text):
- # import re
- # regex = re.compile('<.*?>')
- # return re.sub(regex, '', text)
-
- # for r in review_list:
- # r.content = strip_html_tags(r.content)
+ followers = []
+ if request.user.is_authenticated:
+ followers = []
return render(
request,
- 'games/detail.html',
+ 'detail.html',
{
- 'game': game,
- 'mark': mark,
- 'review': review,
- 'status_enum': MarkStatusEnum,
- 'mark_form': mark_form,
- 'mark_list': mark_list,
- 'mark_list_more': mark_list_more,
- 'review_list': review_list,
- 'review_list_more': review_list_more,
- 'game_tag_list': game_tag_list,
- 'mark_tags': mark_tags,
+ 'collection': collection,
+ 'form': form,
+ 'followers': followers,
+
}
)
else: