RPJosh
/
memories
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix empty face merge modal (fix #71)

old-stable24
Varun Patil 2022-10-17 07:43:46 -07:00
parent 52831329af
commit c3719a3049
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/modal/FaceMergeModal.vue
View File

@ -4,9 +4,9 @@
{{ t('memories', 'Merge {name} with person', { name }) }} {{ t('memories', 'Merge {name} with person', { name }) }}
</template> </template>
<div class="outer"> <div class="outer" v-if="detail">
<div class="photo" v-for="photo of detail" :key="photo.fileid" > <div class="photo" v-for="photo of detail" :key="photo.fileid" >
<Tag :data="photo" :rowHeight="115" :noNavigate="true" @open="clickFace" /> <Tag :data="photo" :noNavigate="true" @open="clickFace" />
</div> </div>
<div v-if="procesingTotal > 0" class="info-pad"> <div v-if="procesingTotal > 0" class="info-pad">
@ -17,6 +17,10 @@
</div> </div>
</div> </div>
<div v-else>
{{ t('memories', 'Loading …') }}
</div>
<template #buttons> <template #buttons>
<NcButton @click="close" class="button" type="error"> <NcButton @click="close" class="button" type="error">
{{ t('memories', 'Cancel') }} {{ t('memories', 'Cancel') }}
@ -48,7 +52,7 @@ import * as dav from '../../services/DavRequests';
export default class FaceMergeModal extends Mixins(GlobalMixin) { export default class FaceMergeModal extends Mixins(GlobalMixin) {
private user: string = ""; private user: string = "";
private name: string = ""; private name: string = "";
private detail: IPhoto[] = []; private detail: IPhoto[] | null = null;
private processing = 0; private processing = 0;
private procesingTotal = 0; private procesingTotal = 0;
@ -67,7 +71,7 @@ export default class FaceMergeModal extends Mixins(GlobalMixin) {
public async refreshParams() { public async refreshParams() {
this.user = this.$route.params.user || ''; this.user = this.$route.params.user || '';
this.name = this.$route.params.name || ''; this.name = this.$route.params.name || '';
this.detail = []; this.detail = null;
this.processing = 0; this.processing = 0;
this.procesingTotal = 0; this.procesingTotal = 0;
@ -153,6 +157,11 @@ export default class FaceMergeModal extends Mixins(GlobalMixin) {
cursor: pointer; cursor: pointer;
vertical-align: top; vertical-align: top;
font-size: 0.8em; font-size: 0.8em;
max-width: 120px;
width: calc(33.33% - 2px);
aspect-ratio: 1/1;
margin: 1px;
} }
.info-pad { .info-pad {
margin-top: 6px; margin-top: 6px;