diff --git a/ayanova/src/plugins/vuetify.js b/ayanova/src/plugins/vuetify.js index af34bebb..64391c46 100644 --- a/ayanova/src/plugins/vuetify.js +++ b/ayanova/src/plugins/vuetify.js @@ -82,6 +82,7 @@ import { faFileMedicalAlt, faFilePdf, faFilePowerpoint, + faFileUpload, faFileVideo, faFileWord, faFilter, @@ -228,6 +229,7 @@ library.add( faFileMedicalAlt, faFilePdf, faFilePowerpoint, + faFileUpload, faFileVideo, faFileWord, faFilter, @@ -652,6 +654,12 @@ const CUSTOM_ICONS = { icon: ["fas", "file-powerpoint"] } }, + ayiFileUpload: { + component: FontAwesomeIcon, + props: { + icon: ["fas", "file-upload"] + } + }, ayiFileVidio: { component: FontAwesomeIcon, props: { diff --git a/ayanova/src/views/adm-import.vue b/ayanova/src/views/adm-import.vue index ed1fda19..fde92575 100644 --- a/ayanova/src/views/adm-import.vue +++ b/ayanova/src/views/adm-import.vue @@ -1,43 +1,46 @@ @@ -63,7 +66,6 @@ export default { ayaType: 0, importResult: "", rights: window.$gz.role.defaultRightsObject(), - reload: false, uploading: false }; }, @@ -72,7 +74,7 @@ export default { //similar code in wiki-control let vm = this; let fileData = []; - let importResult=""; + let importResult = ""; for (let i = 0; i < vm.uploadFiles.length; i++) { let f = vm.uploadFiles[i]; fileData.push({ name: f.name, lastModified: f.lastModified }); @@ -89,8 +91,12 @@ export default { window.$gz.errorHandler.handleFormError(res.error); } else { vm.uploadFiles = []; - vm.importResult = res.data; - this.reload = !this.reload; + //result is an array of strings + let outText = ""; + res.data.forEach(function appendImportResultItem(value) { + outText += value + "\n"; + }); + vm.importResult = outText; } } catch (error) { window.$gz.errorHandler.handleFormError(error); diff --git a/ayanova/src/views/adm-report-templates.vue b/ayanova/src/views/adm-report-templates.vue index e0e02840..92cef2ea 100644 --- a/ayanova/src/views/adm-report-templates.vue +++ b/ayanova/src/views/adm-report-templates.vue @@ -16,7 +16,7 @@ v-model="uploadFiles" :label="$ay.t('Import')" accept=".ayrt" - prepend-icon="$ayiFile-upload" + prepend-icon="$ayiFileUpload" multiple chips > diff --git a/ayanova/src/views/adm-translations.vue b/ayanova/src/views/adm-translations.vue index 5b9bf29c..19dee260 100644 --- a/ayanova/src/views/adm-translations.vue +++ b/ayanova/src/views/adm-translations.vue @@ -15,7 +15,7 @@ v-model="uploadFiles" :label="$ay.t('Import')" accept="application/json" - prepend-icon="$ayiFile-upload" + prepend-icon="$ayiFileUpload" multiple chips >