diff --git a/journal/models.py b/journal/models.py index b2ab2f97..3178f4b2 100644 --- a/journal/models.py +++ b/journal/models.py @@ -619,12 +619,15 @@ class ShelfManager: # ) # return shelf.members.all().order_by - def get_title(self, shelf_type, item_category): - ic = ItemCategory(item_category).label + def get_action_label(self, shelf_type, item_category): sts = [ n[2] for n in ShelfTypeNames if n[0] == item_category and n[1] == shelf_type ] - st = sts[0] if sts else shelf_type + return sts[0] if sts else shelf_type + + def get_label(self, shelf_type, item_category): + ic = ItemCategory(item_category).label + st = self.get_action_label(shelf_type, item_category) return _("{shelf_label}的{item_category}").format( shelf_label=st, item_category=ic ) @@ -838,10 +841,20 @@ class Mark: def shelf_type(self): return self.shelfmember.parent.shelf_type if self.shelfmember else None + @property + def action_label(self): + return ( + self.owner.shelf_manager.get_action_label( + self.shelf_type, self.item.category + ) + if self.shelfmember + else None + ) + @property def shelf_label(self): return ( - self.owner.shelf_manager.get_title(self.shelf_type, self.item.category) + self.owner.shelf_manager.get_label(self.shelf_type, self.item.category) if self.shelfmember else None ) diff --git a/journal/views.py b/journal/views.py index 2bc520f8..ff72acb6 100644 --- a/journal/views.py +++ b/journal/views.py @@ -569,7 +569,7 @@ def profile(request, user_name): .order_by("-created_time") ) shelf_list[category][shelf_type] = { - "title": user.shelf_manager.get_title(shelf_type, category), + "title": user.shelf_manager.get_label(shelf_type, category), "count": members.count(), "members": members[:5].prefetch_related("item"), } diff --git a/social/templates/activity/mark_item.html b/social/templates/activity/mark_item.html index 427f4519..39f5de9c 100644 --- a/social/templates/activity/mark_item.html +++ b/social/templates/activity/mark_item.html @@ -32,7 +32,7 @@ - {{ activity.owner.display_name }} {{ activity.action_object.parent.shelf_label }} + {{ activity.owner.display_name }} {{ activity.action_object.mark.action_label }}