Skip to content
Snippets Groups Projects
Commit 04e7ac2b authored by Roang's avatar Roang
Browse files

Add activity log to team detail view

parent a4fb7667
No related branches found
No related tags found
No related merge requests found
...@@ -160,4 +160,11 @@ ...@@ -160,4 +160,11 @@
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% if can_change %}
<div class="row mt-3">
<div class="col-md-12">
{% include "backoffice/components/activity_log_card.html" with filtered_logentry_changes_keys="" %}
</div>
</div>
{% endif %}
{% endblock content %} {% endblock content %}
...@@ -104,11 +104,14 @@ class TeamDetailView(SingleUUIDObjectMixin, TeamNavContextMixin, AutoPermissionR ...@@ -104,11 +104,14 @@ class TeamDetailView(SingleUUIDObjectMixin, TeamNavContextMixin, AutoPermissionR
if not Team.type_is(team := self.object): # pragma: no cover if not Team.type_is(team := self.object): # pragma: no cover
raise ValueError('Invalid object type') raise ValueError('Invalid object type')
member_id = self.get_queryset().filter(uuid=team.uuid, members__user=self.request.user).values_list('members__id', flat=True).first() member_id = self.get_queryset().filter(uuid=team.uuid, members__user=self.request.user).values_list('members__id', flat=True).first()
log_entries = team.logentries.order_by('-timestamp')
return { return {
**super().get_context_data(**kwargs), **super().get_context_data(**kwargs),
'member_id': member_id, 'member_id': member_id,
'received_invitations': team.received_invitations.filter(state=Invitation.RequestsState.REQUESTED), 'received_invitations': team.received_invitations.filter(state=Invitation.RequestsState.REQUESTED),
'sent_invitations': team.sent_invitations.filter(state=Invitation.RequestsState.REQUESTED), 'sent_invitations': team.sent_invitations.filter(state=Invitation.RequestsState.REQUESTED),
'all_log_entries': log_entries.all(),
'mst_log_entries': log_entries.filter(comment__isnull=False),
} }
......
...@@ -97,7 +97,7 @@ class Team(RulesModelMixin, ActivityLogMixin, Group, metaclass=RulesModelBase): ...@@ -97,7 +97,7 @@ class Team(RulesModelMixin, ActivityLogMixin, Group, metaclass=RulesModelBase):
return isinstance(obj, cls) return isinstance(obj, cls)
def save(self, *args, update_fields=None, **kwargs): def save(self, *args, update_fields=None, **kwargs):
if update_fields is None or 'description' in update_fields: if update_fields is None or 'description' in update_fields: # pragma: no branch
render_results = compile_translated_markdown_fields(self, self.conference, 'description') render_results = compile_translated_markdown_fields(self, self.conference, 'description')
store_relationships(self.conference, self, render_results) store_relationships(self.conference, self, render_results)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment