Itmens/lib.itmens
Itmens/lib.itmens
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

add back last_editor

Browse source
This commit is contained in:
Your Name 2022-12-26 14:56:39 -05:00
parent b6432fa7d8
commit 41b6426ecb
6 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
catalog/common/models.py
View file

@ -11,6 +11,7 @@ import uuid
from .utils import DEFAULT_ITEM_COVER, item_cover_path
from .mixins import SoftDeleteMixin
from django.conf import settings
from users.models import User
class SiteName(models.TextChoices):
@ -186,6 +187,7 @@ class Item(SoftDeleteMixin, PolymorphicModel):
is_deleted = models.BooleanField(default=False, db_index=True)
history = HistoricalRecords()
merged_to_item = models.ForeignKey('Item', null=True, on_delete=models.SET_NULL, default=None, related_name="merged_from_items")
last_editor = models.ForeignKey(User, on_delete=models.SET_NULL, related_name='+', null=True, blank=False)
class Meta:
unique_together = [['polymorphic_ctype_id', 'primary_lookup_id_type', 'primary_lookup_id_value']]

4
journal/models.py
View file

@ -119,6 +119,10 @@ class Review(Content):
def html_content(self):
return mistune.html(self.body)
@cached_property
def rating_grade(self):
return Rating.get_item_rating_by_user(self.item, self.owner)
@ staticmethod
def review_item_by_user(item, user, title, body, metadata={}, visibility=0):
# allow multiple reviews per item per user.

1
journal/views.py
View file

@ -159,7 +159,6 @@ def review_delete(request, review_uuid):
return render(request, 'review_delete.html', {'form': review_form, 'review': review})
elif request.method == 'POST':
item = review.item
print(review)
review.delete()
return redirect(item.url)
else:

1
legacy/management/commands/migrate_catalog.py
View file

@ -205,6 +205,7 @@ class Command(BaseCommand):
obj['primary_lookup_id_value'] = v
item = model.objects.create(**obj)
item.cover = content.metadata['cover_image_path']
item.last_editor = entity.last_editor
item.save()
links.append(LinkModel(old_id=entity.id, new_uid=item.uid))
# pprint.pp(site.get_item())

2
social/templates/feed.html
View file

@ -12,7 +12,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>{{ site_name }}</title>
<title>{{ site_name }} - {% trans '动态' %}</title>
{% include "common_libs.html" with jquery=1 %}
<script src="{% static 'js/mastodon.js' %}"></script>
<script src="{% static 'js/home.js' %}"></script>

1
social/templates/feed_data.html
View file

@ -82,7 +82,6 @@ hx-swap="outerHTML">
// readonly star rating at aside section
ratingLabels = $(".rating-star");
$(ratingLabels).each( function(index, value) {
console.log($(this).data("rating-score"))
let ratingScore = $(this).data("rating-score") / 2;
$(this).starRating({
initialRating: ratingScore,