From 356efaf5cee269a6ed6822730eb3ccebc9d24bee Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 16 May 2022 22:20:53 -0400 Subject: [PATCH] fix potential export 500; save shared links --- books/templates/books/detail.html | 26 +-------------- books/templates/books/mark_list.html | 37 +--------------------- common/models.py | 2 ++ common/templates/partial/mark_list.html | 37 ++++++++++++++++++++++ games/templates/games/detail.html | 23 +------------- games/templates/games/mark_list.html | 32 +------------------ mastodon/api.py | 33 ++++++++++++++----- movies/templates/movies/detail.html | 27 +--------------- movies/templates/movies/mark_list.html | 37 +--------------------- music/templates/music/album_detail.html | 23 +------------- music/templates/music/album_mark_list.html | 33 +------------------ music/templates/music/song_detail.html | 23 +------------- music/templates/music/song_mark_list.html | 33 +------------------ users/data.py | 12 ++++--- users/tasks.py | 4 +-- 15 files changed, 84 insertions(+), 298 deletions(-) create mode 100644 common/templates/partial/mark_list.html diff --git a/books/templates/books/detail.html b/books/templates/books/detail.html index 9004ef6b..86a4c860 100644 --- a/books/templates/books/detail.html +++ b/books/templates/books/detail.html @@ -157,31 +157,7 @@
{% trans '这本书的标记' %}
{% trans '全部标记' %} 关注的人的标记 - {% if mark_list %} - - {% else %} -
{% trans '暂无标记' %}
- {% endif %} + {% include "partial/mark_list.html" with mark_list=mark_list current_item=book %}
{% trans '这本书的评论' %}
diff --git a/books/templates/books/mark_list.html b/books/templates/books/mark_list.html index 3d27a96d..66a269a7 100644 --- a/books/templates/books/mark_list.html +++ b/books/templates/books/mark_list.html @@ -33,42 +33,7 @@
{{ book.title }}{% trans ' 的标记' %}
- + {% include "partial/mark_list.html" with mark_list=marks current_item=book %}
{% trans '这个游戏的评论' %}
diff --git a/games/templates/games/mark_list.html b/games/templates/games/mark_list.html index 8009c747..e56f41a5 100644 --- a/games/templates/games/mark_list.html +++ b/games/templates/games/mark_list.html @@ -35,37 +35,7 @@
{{ game.title }}{% trans ' 的标记' %}
- + {% include "partial/mark_list.html" with mark_list=marks current_item=game %}
{% if movie.is_series %} diff --git a/movies/templates/movies/mark_list.html b/movies/templates/movies/mark_list.html index 0a9d6072..5a7ca177 100644 --- a/movies/templates/movies/mark_list.html +++ b/movies/templates/movies/mark_list.html @@ -35,42 +35,7 @@
{{ movie.title }}{% trans ' 的标记' %}
- + {% include "partial/mark_list.html" with mark_list=marks current_item=movie %}
{% trans '这部作品的评论' %}
diff --git a/music/templates/music/album_mark_list.html b/music/templates/music/album_mark_list.html index dcb8eaeb..d216d268 100644 --- a/music/templates/music/album_mark_list.html +++ b/music/templates/music/album_mark_list.html @@ -35,38 +35,7 @@
{{ album.title }}{% trans '的标记' %}
- + {% include "partial/mark_list.html" with mark_list=marks current_item=album %}
{% trans '这部作品的评论' %}
diff --git a/music/templates/music/song_mark_list.html b/music/templates/music/song_mark_list.html index 1bcd8875..26ffba94 100644 --- a/music/templates/music/song_mark_list.html +++ b/music/templates/music/song_mark_list.html @@ -35,38 +35,7 @@
{{ song.title }}{% trans '的标记' %}
- + {% include "partial/mark_list.html" with mark_list=marks current_item=song %}