diff --git a/src/backoffice/templates/backoffice/teams/detail.html b/src/backoffice/templates/backoffice/teams/detail.html index 552a76a5ffff1bce6d88808dcbf77eb8f31a00ff..5309f643f502047ac62a2692c4edcd4b802fa845 100644 --- a/src/backoffice/templates/backoffice/teams/detail.html +++ b/src/backoffice/templates/backoffice/teams/detail.html @@ -160,4 +160,11 @@ </div> </div> {% 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 %} diff --git a/src/backoffice/views/teams/teams.py b/src/backoffice/views/teams/teams.py index 474a2a613512796a6ddeccc355a278b6b958942c..0fb6c7a49887ad50e8f0c2f6116c0c36bcbcd3e5 100644 --- a/src/backoffice/views/teams/teams.py +++ b/src/backoffice/views/teams/teams.py @@ -104,11 +104,14 @@ class TeamDetailView(SingleUUIDObjectMixin, TeamNavContextMixin, AutoPermissionR if not Team.type_is(team := self.object): # pragma: no cover 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() + log_entries = team.logentries.order_by('-timestamp') return { **super().get_context_data(**kwargs), 'member_id': member_id, 'received_invitations': team.received_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), } diff --git a/src/core/models/teams/teams.py b/src/core/models/teams/teams.py index e5f95667f39a51234330633bb71f83bb9bdd7ff5..ccd8b07cfc970a2a44999cf243ddec78cd914f97 100644 --- a/src/core/models/teams/teams.py +++ b/src/core/models/teams/teams.py @@ -97,7 +97,7 @@ class Team(RulesModelMixin, ActivityLogMixin, Group, metaclass=RulesModelBase): return isinstance(obj, cls) 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') store_relationships(self.conference, self, render_results)