diff --git a/src/admin/components/edition/importer-edition-form.vue b/src/admin/components/edition/importer-edition-form.vue index 22aa6ea33..2a9d36bd6 100644 --- a/src/admin/components/edition/importer-edition-form.vue +++ b/src/admin/components/edition/importer-edition-form.vue @@ -143,6 +143,7 @@ (importer.accepts.file && importer.accepts.url && !importerFile && !url)" id="button-submit-collection-creation" @click.prevent="onFinishImporter()" + :class="{'is-loading': isLoadingUpload }" class="button is-success">{{ $i18n.get('next') }} @@ -164,6 +165,7 @@ export default { importer: null, isLoading: false, isLoadingRun: false, + isLoadingUpload: false, isFetchingCollections: false, form: { @@ -295,20 +297,33 @@ export default { }); }, uploadSource() { + this.isLoadingUpload = true; return new Promise((resolve, reject) => { - if (this.importer.accepts.file && !this.importer.accepts.url) - this.onUploadFile().then(() => { resolve() }).catch((errors) => this.$console.log(errors)); - else if (!this.importer.accepts.file && this.importer.accepts.url) - this.onInputURL().then(() => { resolve() }).catch((errors) => this.$console.log(errors)); - else if (this.importer.accepts.file && this.importer.accepts.url) { - if (this.importerFile) - this.onUploadFile().then(() => { resolve() }).catch((errors) => this.$console.log(errors)); - else if (this.url) - this.onInputURL().then(() => { resolve() }).catch((errors) => this.$console.log(errors)); - else + if (this.importer.accepts.file && !this.importer.accepts.url) { + this.onUploadFile() + .then(() => { this.isLoadingUpload = false; resolve(); }) + .catch((errors) => { this.isLoadingUpload = false; this.$console.log(errors) }); + } else if (!this.importer.accepts.file && this.importer.accepts.url) { + this.onInputURL() + .then(() => { this.isLoadingUpload = false; resolve() }) + .catch((errors) => { this.isLoadingUpload = false; this.$console.log(errors); }); + } else if (this.importer.accepts.file && this.importer.accepts.url) { + if (this.importerFile) { + this.onUploadFile() + .then(() => { this.isLoadingUpload = false; resolve(); }) + .catch((errors) => { this.isLoadingUpload = false; this.$console.log(errors) }); + } else if (this.url) { + this.onInputURL() + .then(() => { this.isLoadingUpload = false; resolve() }) + .catch((errors) => { this.isLoadingUpload = false; this.$console.log(errors); }); + } else { + this.isLoadingUpload = false; reject('No source file given'); - } else + } + } else { + this.isLoadingUpload = false; resolve(); + } }); }, onFinishImporter() { diff --git a/src/admin/components/lists/processes-list.vue b/src/admin/components/lists/processes-list.vue index 8b094506e..ed37907b7 100644 --- a/src/admin/components/lists/processes-list.vue +++ b/src/admin/components/lists/processes-list.vue @@ -106,7 +106,9 @@ autoHide: false, placement: 'auto-start' }"> - {{ bgProcess.progress_label ? bgProcess.progress_label + (bgProcess.progress_value ? ' (' + bgProcess.progress_value + '%)' : '') : $i18n.get('label_no_details_of_process') }}
+ {{ bgProcess.progress_label ? bgProcess.progress_label : $i18n.get('label_no_details_of_process') }} + {{ bgProcess.progress_value ? ' (' + bgProcess.progress_value + '%)' : '' }} +
@@ -386,6 +388,15 @@
}
}
+ .occluding-content {
+ width: calc(100% - 40px);
+ display: inline-block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ top: 4px;
+ position: relative;
+ }
+
diff --git a/src/classes/filter-types/checkbox/Checkbox.vue b/src/classes/filter-types/checkbox/Checkbox.vue
index d970e3504..11929ab8b 100644
--- a/src/classes/filter-types/checkbox/Checkbox.vue
+++ b/src/classes/filter-types/checkbox/Checkbox.vue
@@ -6,8 +6,9 @@
class="metadatum">