diff --git a/src/components/pages/Breakdown.vue b/src/components/pages/Breakdown.vue
index e83817cca..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"
/>
@@ -618,8 +617,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 => {
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
}
},