From 4edf76f6b16fb961f2b96687eccc28fe09cf9f9b Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Tue, 9 Dec 2025 12:16:54 +0100 Subject: [PATCH 1/3] [logs] add user filtering to the log list --- src/components/pages/logs/Events.vue | 29 +++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/components/pages/logs/Events.vue b/src/components/pages/logs/Events.vue index 3e59ff3fc..cc7a469d5 100644 --- a/src/components/pages/logs/Events.vue +++ b/src/components/pages/logs/Events.vue @@ -8,17 +8,23 @@ :label="$t('logs.current_date_label')" v-model="currentDate" /> + - {{ events.length }} {{ $t('logs.events') }} + {{ filteredEvents.length }} {{ $t('logs.events') }} -
+
{{ $t('logs.empty_list') }}
@@ -89,6 +95,7 @@ import { timeMixin } from '@/components/mixins/time' import ButtonSimple from '@/components/widgets/ButtonSimple.vue' import DateField from '@/components/widgets/DateField.vue' import PeopleAvatar from '@/components/widgets/PeopleAvatar.vue' +import PeopleField from '@/components/widgets/PeopleField.vue' import PeopleName from '@/components/widgets/PeopleName.vue' import Spinner from '@/components/widgets/Spinner.vue' @@ -101,6 +108,7 @@ export default { ButtonSimple, DateField, PeopleAvatar, + PeopleField, PeopleName, Spinner }, @@ -113,6 +121,7 @@ export default { events: [], isLoading: true, selectedEvents: {}, + selectedPerson: null, displayLimit: PAGE_SIZE } }, @@ -122,18 +131,28 @@ export default { }, computed: { - ...mapGetters(['personMap', 'user']), + ...mapGetters(['people', 'personMap', 'user']), today() { return moment().toDate() }, + filteredEvents() { + let events = this.events + if (this.selectedPerson) { + events = events.filter( + event => event.user_id === this.selectedPerson.id + ) + } + return events + }, + displayedEvents() { - return this.events.slice(0, this.displayLimit) + return this.filteredEvents.slice(0, this.displayLimit) }, hasMoreEvents() { - return this.events.length > this.displayLimit + return this.filteredEvents.length > this.displayLimit } }, From 5cdbddab9a618d4aef04c0d6ae10880890d84751 Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Wed, 10 Dec 2025 10:57:07 +0100 Subject: [PATCH 2/3] [breakdown] fix the list of available assets that include shared assets --- src/components/pages/Breakdown.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/pages/Breakdown.vue b/src/components/pages/Breakdown.vue index e83817cca..73ef70afe 100644 --- a/src/components/pages/Breakdown.vue +++ b/src/components/pages/Breakdown.vue @@ -618,8 +618,7 @@ export default { const result = [] this.assetsByType.forEach(typeGroup => { let newGroup = typeGroup.filter( - asset => - !asset.canceled && (!asset.is_shared || this.libraryDisplayed) + asset => !asset.canceled && (!asset.shared || this.libraryDisplayed) ) if (this.isTVShow && this.isOnlyCurrentEpisode) { newGroup = typeGroup.filter(asset => { From 77465bc19fe10d16df45c7d437a205112f01913d Mon Sep 17 00:00:00 2001 From: Nicolas Pennec Date: Wed, 10 Dec 2025 10:58:11 +0100 Subject: [PATCH 3/3] [qa] remove useless code --- src/components/pages/Breakdown.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/pages/Breakdown.vue b/src/components/pages/Breakdown.vue index 73ef70afe..fc147d792 100644 --- a/src/components/pages/Breakdown.vue +++ b/src/components/pages/Breakdown.vue @@ -336,7 +336,6 @@ @add-one="addOneAsset" @add-ten="addTenAssets" v-for="asset in typeAssets" - v-show="libraryDisplayed || !asset.shared" />