diff --git a/books/templates/books/detail.html b/books/templates/books/detail.html index 76975c5f..9004ef6b 100644 --- a/books/templates/books/detail.html +++ b/books/templates/books/detail.html @@ -169,7 +169,7 @@ {% if others_mark.visibility > 0 %} {% endif %} - {{ others_mark.edited_time }} + {{ others_mark.created_time }} {% if others_mark.book != book %} {{ others_mark.book.get_source_site_display }} {% endif %} @@ -235,7 +235,7 @@
-{{ mark.text }}
diff --git a/books/templates/books/mark_list.html b/books/templates/books/mark_list.html index 0991a630..3d27a96d 100644 --- a/books/templates/books/mark_list.html +++ b/books/templates/books/mark_list.html @@ -52,7 +52,7 @@ d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" /> {% endif %} - {{ mark.edited_time }} + {{ mark.created_time }} {% if mark.book != book %} {{ mark.book.get_source_site_display }} {% endif %} diff --git a/books/views.py b/books/views.py index 68f4624f..6a76f16d 100644 --- a/books/views.py +++ b/books/views.py @@ -270,6 +270,8 @@ def create_update_mark(request): return HttpResponseBadRequest() old_rating = mark.rating old_tags = mark.bookmark_tags.all() + if mark.status != request.POST.get('status'): + mark.created_time = timezone.now() # update form = BookMarkForm(request.POST, instance=mark) else: diff --git a/common/templates/partial/list_item_book.html b/common/templates/partial/list_item_book.html index ecbbd387..3c5dc9eb 100644 --- a/common/templates/partial/list_item_book.html +++ b/common/templates/partial/list_item_book.html @@ -127,7 +127,7 @@ {% endif %} - {% trans '于' %} {{ mark.edited_time }} + {% trans '于' %} {{ mark.created_time }} {% if status == 'reviewed' %} {% trans '评论' %}: {{ mark.title }} {% else %} diff --git a/common/templates/partial/list_item_game.html b/common/templates/partial/list_item_game.html index 469f0e68..42346910 100644 --- a/common/templates/partial/list_item_game.html +++ b/common/templates/partial/list_item_game.html @@ -106,7 +106,7 @@ {% endif %} - {% trans '于' %} {{ mark.edited_time }} + {% trans '于' %} {{ mark.created_time }} {% if status == 'reviewed' %} {% trans '评论' %}: {{ mark.title }} {% else %} diff --git a/common/templates/partial/list_item_movie.html b/common/templates/partial/list_item_movie.html index ea2d22eb..f20f40f5 100644 --- a/common/templates/partial/list_item_movie.html +++ b/common/templates/partial/list_item_movie.html @@ -131,7 +131,7 @@ {% endif %} - {% trans '于' %} {{ mark.edited_time }} + {% trans '于' %} {{ mark.created_time }} {% if status == 'reviewed' %} {% trans '评论' %}: {{ mark.title }} {% else %} diff --git a/common/templates/partial/list_item_music.html b/common/templates/partial/list_item_music.html index 62dccd9e..bcf0d29a 100644 --- a/common/templates/partial/list_item_music.html +++ b/common/templates/partial/list_item_music.html @@ -132,7 +132,7 @@ {% endif %} - {% trans '于' %} {{ mark.edited_time }} + {% trans '于' %} {{ mark.created_time }} {% if status == 'reviewed' %} {% trans '评论' %}: {% if music.category_name|lower == 'album' %} diff --git a/games/templates/games/detail.html b/games/templates/games/detail.html index 9ec6dbf1..de2079bb 100644 --- a/games/templates/games/detail.html +++ b/games/templates/games/detail.html @@ -196,7 +196,7 @@ {% if others_mark.visibility > 0 %} {% endif %} - {{ others_mark.edited_time }} + {{ others_mark.created_time }} {% if others_mark.text %}{{ others_mark.text }}
{% endif %} @@ -258,7 +258,7 @@ -{{ mark.text }}
diff --git a/games/templates/games/mark_list.html b/games/templates/games/mark_list.html index dea6dda7..8009c747 100644 --- a/games/templates/games/mark_list.html +++ b/games/templates/games/mark_list.html @@ -53,7 +53,7 @@ d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" /> {% endif %} - {{ mark.edited_time }} + {{ mark.created_time }} {% if mark.text %}{{ mark.text }}
{% endif %} diff --git a/games/views.py b/games/views.py index 2882888b..df8f071f 100644 --- a/games/views.py +++ b/games/views.py @@ -272,6 +272,8 @@ def create_update_mark(request): return HttpResponseBadRequest() old_rating = mark.rating old_tags = mark.gamemark_tags.all() + if mark.status != request.POST.get('status'): + mark.created_time = timezone.now() # update form = GameMarkForm(request.POST, instance=mark) else: diff --git a/movies/templates/movies/detail.html b/movies/templates/movies/detail.html index 8ffc4e47..d912f66e 100644 --- a/movies/templates/movies/detail.html +++ b/movies/templates/movies/detail.html @@ -267,7 +267,7 @@ {% if others_mark.visibility > 0 %} {% endif %} - {{ others_mark.edited_time }} + {{ others_mark.created_time }} {% if others_mark.movie != movie %} {{ others_mark.movie.get_source_site_display }} {% endif %} @@ -341,7 +341,7 @@ -{{ mark.text }}
diff --git a/movies/templates/movies/mark_list.html b/movies/templates/movies/mark_list.html index 11a5a75a..0a9d6072 100644 --- a/movies/templates/movies/mark_list.html +++ b/movies/templates/movies/mark_list.html @@ -53,8 +53,8 @@ d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" /> {% endif %} - {{ mark.edited_time }} - {{ mark.edited_time }} + {{ mark.created_time }} + {{ mark.created_time }} {% if mark.movie != movie %} {{ mark.movie.get_source_site_display }} {% endif %} diff --git a/movies/views.py b/movies/views.py index 57e02fca..43a46c78 100644 --- a/movies/views.py +++ b/movies/views.py @@ -271,6 +271,8 @@ def create_update_mark(request): return HttpResponseBadRequest() old_rating = mark.rating old_tags = mark.moviemark_tags.all() + if mark.status != request.POST.get('status'): + mark.created_time = timezone.now() # update form = MovieMarkForm(request.POST, instance=mark) else: diff --git a/music/templates/music/album_detail.html b/music/templates/music/album_detail.html index 73d569cf..9160ec15 100644 --- a/music/templates/music/album_detail.html +++ b/music/templates/music/album_detail.html @@ -232,7 +232,7 @@ {% if others_mark.visibility > 0 %} {% endif %} - {{ others_mark.edited_time }} + {{ others_mark.created_time }} {% if others_mark.text %}{{ others_mark.text }}
{% endif %} @@ -294,7 +294,7 @@ -{{ mark.text }}
diff --git a/music/templates/music/album_mark_list.html b/music/templates/music/album_mark_list.html index 49977735..dcb8eaeb 100644 --- a/music/templates/music/album_mark_list.html +++ b/music/templates/music/album_mark_list.html @@ -54,7 +54,7 @@ d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" /> {% endif %} - {{ mark.edited_time }} + {{ mark.created_time }} {% if mark.text %}{{ mark.text }}
{% endif %} diff --git a/music/templates/music/song_detail.html b/music/templates/music/song_detail.html index ed7bf32f..561cca70 100644 --- a/music/templates/music/song_detail.html +++ b/music/templates/music/song_detail.html @@ -178,7 +178,7 @@ {% if others_mark.visibility > 0 %} {% endif %} - {{ others_mark.edited_time }} + {{ others_mark.created_time }} {% if others_mark.text %}{{ others_mark.text }}
{% endif %} @@ -240,7 +240,7 @@ -{{ mark.text }}
diff --git a/music/templates/music/song_mark_list.html b/music/templates/music/song_mark_list.html index 49f6e860..1bcd8875 100644 --- a/music/templates/music/song_mark_list.html +++ b/music/templates/music/song_mark_list.html @@ -54,7 +54,7 @@ d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z" /> {% endif %} - {{ mark.edited_time }} + {{ mark.created_time }} {% if mark.text %}{{ mark.text }}
{% endif %} diff --git a/music/views.py b/music/views.py index 4b600f7e..80afd0ab 100644 --- a/music/views.py +++ b/music/views.py @@ -290,6 +290,8 @@ def create_update_song_mark(request): return HttpResponseBadRequest() old_rating = mark.rating old_tags = mark.songmark_tags.all() + if mark.status != request.POST.get('status'): + mark.created_time = timezone.now() # update form = SongMarkForm(request.POST, instance=mark) else: @@ -831,6 +833,8 @@ def create_update_album_mark(request): return HttpResponseBadRequest() old_rating = mark.rating old_tags = mark.albummark_tags.all() + if mark.status != request.POST.get('status'): + mark.created_time = timezone.now() # update form = AlbumMarkForm(request.POST, instance=mark) else: