diff --git a/books/templates/books/detail.html b/books/templates/books/detail.html
index 9751aebf..9132df6d 100644
--- a/books/templates/books/detail.html
+++ b/books/templates/books/detail.html
@@ -312,6 +312,21 @@
{% endif %}
+
+ {% if collection_list %}
+
+
+
{% trans '相关收藏单' %}
+
+ {% for c in collection_list %}
+
+ {{ c.title }}
+
+ {% endfor %}
+
+
+
+ {% endif %}
diff --git a/books/views.py b/books/views.py
index 1c9ac847..77ae6af5 100644
--- a/books/views.py
+++ b/books/views.py
@@ -19,6 +19,7 @@ from .models import *
from .forms import *
from .forms import BookMarkStatusTranslator
from django.conf import settings
+from collection.models import CollectionItem
logger = logging.getLogger(__name__)
@@ -194,6 +195,7 @@ def retrieve(request, id):
review_list_more = True if len(
review_list) > REVIEW_NUMBER else False
review_list = review_list[:REVIEW_NUMBER]
+ collection_list = filter(lambda c: c.is_visible_to(request.user), map(lambda i: i.collection, CollectionItem.objects.filter(book=book)))
# def strip_html_tags(text):
# import re
@@ -218,6 +220,7 @@ def retrieve(request, id):
'review_list_more': review_list_more,
'book_tag_list': book_tag_list,
'mark_tags': mark_tags,
+ 'collection_list': collection_list,
}
)
else:
diff --git a/collection/forms.py b/collection/forms.py
index 4db1e885..02329e62 100644
--- a/collection/forms.py
+++ b/collection/forms.py
@@ -1,5 +1,4 @@
from django import forms
-from django.contrib.postgres.forms import SimpleArrayField
from django.utils.translation import gettext_lazy as _
from .models import Collection
from common.forms import *
@@ -9,8 +8,7 @@ class CollectionForm(forms.ModelForm):
# id = forms.IntegerField(required=False, widget=forms.HiddenInput())
title = forms.CharField(label=_("标题"))
description = MarkdownxFormField(label=_("详细介绍 (Markdown)"))
- share_to_mastodon = forms.BooleanField(
- label=_("分享到联邦网络"), initial=True, required=False)
+ # share_to_mastodon = forms.BooleanField(label=_("分享到联邦网络"), initial=True, required=False)
visibility = forms.TypedChoiceField(
label=_("可见性"),
initial=0,
diff --git a/collection/models.py b/collection/models.py
index 936032f8..b31d1196 100644
--- a/collection/models.py
+++ b/collection/models.py
@@ -41,7 +41,6 @@ class Collection(UserOwnedEntity):
return None
else:
i = CollectionItem(collection=self, position=cl[-1].position + 1 if len(cl) else 1, comment=comment)
- print(i)
i.set_item(item)
i.save()
return i
diff --git a/collection/templates/create_update.html b/collection/templates/create_update.html
index 0189e566..4ec42c75 100644
--- a/collection/templates/create_update.html
+++ b/collection/templates/create_update.html
@@ -13,6 +13,9 @@
{{ site_name }} - {{ title }}
+
diff --git a/collection/templates/entity_list.html b/collection/templates/entity_list.html
index eaa13f27..50bb86d6 100644
--- a/collection/templates/entity_list.html
+++ b/collection/templates/entity_list.html
@@ -24,6 +24,7 @@
{% endif %}
{{ item.item.title }}
+
[{{item.item.verbose_category_name}}]
{{ item.item.get_source_site_display }}
diff --git a/games/templates/games/detail.html b/games/templates/games/detail.html
index 3a524e79..dbd848b6 100644
--- a/games/templates/games/detail.html
+++ b/games/templates/games/detail.html
@@ -316,6 +316,21 @@
{% endif %}
+
+ {% if collection_list %}
+
+
+
{% trans '相关收藏单' %}
+
+ {% for c in collection_list %}
+
+ {{ c.title }}
+
+ {% endfor %}
+
+
+
+ {% endif %}
diff --git a/games/views.py b/games/views.py
index 54315fa9..272c82c6 100644
--- a/games/views.py
+++ b/games/views.py
@@ -18,6 +18,7 @@ from common.models import SourceSiteEnum
from .models import *
from .forms import *
from django.conf import settings
+from collection.models import CollectionItem
logger = logging.getLogger(__name__)
@@ -196,6 +197,7 @@ def retrieve(request, id):
review_list_more = True if len(
review_list) > REVIEW_NUMBER else False
review_list = review_list[:REVIEW_NUMBER]
+ collection_list = filter(lambda c: c.is_visible_to(request.user), map(lambda i: i.collection, CollectionItem.objects.filter(movie=movie)))
# def strip_html_tags(text):
# import re
@@ -220,6 +222,7 @@ def retrieve(request, id):
'review_list_more': review_list_more,
'game_tag_list': game_tag_list,
'mark_tags': mark_tags,
+ 'collection_list': collection_list,
}
)
else:
diff --git a/mastodon/api.py b/mastodon/api.py
index 024bb7c1..ef57ce5b 100644
--- a/mastodon/api.py
+++ b/mastodon/api.py
@@ -76,7 +76,6 @@ def post_toot(site, content, visibility, token, local_only=False):
}
if not local_only:
del payload['local_only']
- print(payload)
response = post(url, headers=headers, data=payload)
return response
@@ -105,7 +104,6 @@ def create_app(domain_name):
}
response = post(url, data=payload, headers={'User-Agent': 'NeoDB/1.0'})
- print(payload)
return response
diff --git a/movies/templates/movies/detail.html b/movies/templates/movies/detail.html
index 0a37833b..b7302529 100644
--- a/movies/templates/movies/detail.html
+++ b/movies/templates/movies/detail.html
@@ -41,7 +41,6 @@
-
@@ -395,7 +394,7 @@
{% endif %}
-
+
{% if movie.get_related_movies.count > 0 %}
@@ -414,6 +413,20 @@
{% endif %}
+ {% if collection_list %}
+
+
+
{% trans '相关收藏单' %}
+
+ {% for c in collection_list %}
+
+ {{ c.title }}
+
+ {% endfor %}
+
+
+
+ {% endif %}
diff --git a/movies/views.py b/movies/views.py
index 0530c725..41443815 100644
--- a/movies/views.py
+++ b/movies/views.py
@@ -18,6 +18,7 @@ from common.models import SourceSiteEnum
from .models import *
from .forms import *
from django.conf import settings
+from collection.models import CollectionItem
logger = logging.getLogger(__name__)
@@ -195,6 +196,7 @@ def retrieve(request, id):
review_list_more = True if len(
review_list) > REVIEW_NUMBER else False
review_list = review_list[:REVIEW_NUMBER]
+ collection_list = filter(lambda c: c.is_visible_to(request.user), map(lambda i: i.collection, CollectionItem.objects.filter(movie=movie)))
# def strip_html_tags(text):
# import re
@@ -219,6 +221,7 @@ def retrieve(request, id):
'review_list_more': review_list_more,
'movie_tag_list': movie_tag_list,
'mark_tags': mark_tags,
+ 'collection_list': collection_list,
}
)
else:
diff --git a/music/templates/music/album_detail.html b/music/templates/music/album_detail.html
index 341589dd..5da60c8e 100644
--- a/music/templates/music/album_detail.html
+++ b/music/templates/music/album_detail.html
@@ -350,6 +350,21 @@
{% endif %}
+
+ {% if collection_list %}
+
+
+
{% trans '相关收藏单' %}
+
+ {% for c in collection_list %}
+
+ {{ c.title }}
+
+ {% endfor %}
+
+
+
+ {% endif %}
{% if album.get_embed_link %}
diff --git a/music/templates/music/song_detail.html b/music/templates/music/song_detail.html
index ae385b02..eb7abf22 100644
--- a/music/templates/music/song_detail.html
+++ b/music/templates/music/song_detail.html
@@ -297,6 +297,21 @@
{% endif %}
+ {% if collection_list %}
+
+
+
{% trans '相关收藏单' %}
+
+ {% for c in collection_list %}
+
+ {{ c.title }}
+
+ {% endfor %}
+
+
+
+ {% endif %}
+
{% if song.source_site == "spotify" %}
{% endif %}
diff --git a/music/views.py b/music/views.py
index 4de189bb..e35cc0eb 100644
--- a/music/views.py
+++ b/music/views.py
@@ -18,6 +18,7 @@ from django.contrib.auth.decorators import login_required, permission_required
from django.shortcuts import render, get_object_or_404, redirect, reverse
import logging
from django.shortcuts import render
+from collection.models import CollectionItem
logger = logging.getLogger(__name__)
@@ -214,6 +215,7 @@ def retrieve_song(request, id):
review_list_more = True if len(
review_list) > REVIEW_NUMBER else False
review_list = review_list[:REVIEW_NUMBER]
+ collection_list = filter(lambda c: c.is_visible_to(request.user), map(lambda i: i.collection, CollectionItem.objects.filter(song=song)))
# def strip_html_tags(text):
# import re
@@ -238,6 +240,7 @@ def retrieve_song(request, id):
'review_list_more': review_list_more,
'song_tag_list': song_tag_list,
'mark_tags': mark_tags,
+ 'collection_list': collection_list,
}
)
else:
@@ -787,6 +790,7 @@ def retrieve_album(request, id):
review_list_more = True if len(
review_list) > REVIEW_NUMBER else False
review_list = review_list[:REVIEW_NUMBER]
+ collection_list = filter(lambda c: c.is_visible_to(request.user), map(lambda i: i.collection, CollectionItem.objects.filter(album=album)))
# def strip_html_tags(text):
# import re
@@ -811,6 +815,7 @@ def retrieve_album(request, id):
'review_list_more': review_list_more,
'album_tag_list': album_tag_list,
'mark_tags': mark_tags,
+ 'collection_list': collection_list,
}
)
else: