From 97e6222b89519fd7f821c934d6f0a95f8527ee36 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Tue, 2 Aug 2022 11:33:06 -0300 Subject: [PATCH 1/2] Updates thumbnail_alt flow on item edition. --- .../components/edition/item-edition-form.vue | 17 +++++++++++------ .../edition/item-thumbnail-edition-form.vue | 10 ++++++++-- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/views/admin/components/edition/item-edition-form.vue b/src/views/admin/components/edition/item-edition-form.vue index e958f1e09..263195433 100644 --- a/src/views/admin/components/edition/item-edition-form.vue +++ b/src/views/admin/components/edition/item-edition-form.vue @@ -491,7 +491,7 @@ :form="form" :is-loading="isLoading" @onDeleteThumbnail="deleteThumbnail" - @onUpdateThumbnailAlt="($event) => form.thumbnail_alt = $event.target.value" + @onUpdateThumbnailAlt="($event) => onUpdateThumbnailAlt($event)" @openThumbnailMediaFrame="thumbnailMediaFrame.openFrame($event)" /> @@ -590,7 +590,7 @@ :form="form" :is-loading="isLoading" @onDeleteThumbnail="deleteThumbnail" - @onUpdateThumbnailAlt="($event) => form.thumbnail_alt = $event.target.value" + @onUpdateThumbnailAlt="($event) => onUpdateThumbnailAlt($event)" @openThumbnailMediaFrame="thumbnailMediaFrame.openFrame($event)" />
@@ -1395,8 +1395,10 @@ export default { this.isLoading = false; let oldThumbnail = this.item.thumbnail; - if (item.document_type == 'url' && oldThumbnail != item.thumbnail ) + if (item.document_type == 'url' && oldThumbnail != item.thumbnail ) { this.item.thumbnail = item.thumbnail; + this.item.thumbnail_id = item.thumbnail_id; + } }) .catch((errors) => { for (let error of errors.errors) { @@ -1493,8 +1495,10 @@ export default { this.item.document_mimetype = item.document_mimetype; let oldThumbnail = this.item.thumbnail; - if (item.document_type == 'attachment' && oldThumbnail != item.thumbnail ) + if (item.document_type == 'attachment' && oldThumbnail != item.thumbnail ) { this.item.thumbnail = item.thumbnail; + this.item.thumbnail_id = item.thumbnail_id; + } this.shouldLoadAttachments = !this.shouldLoadAttachments; @@ -1552,11 +1556,12 @@ export default { }, onUpdateThumbnailAlt(updatedThumbnailAlt) { + this.isUpdatingValues = true; this.updateThumbnailAlt({ thumbnailId: this.item.thumbnail_id, thumbnailAlt: updatedThumbnailAlt }) .then((res) => { - this.form.thumbnail_id = res.thumbnail_id; - this.form.thumbnail_alt = res.thumbnail_alt; + this.form.thumbnail_alt = res.alt_text; + this.isUpdatingValues = false; }) .catch(error => this.$console.error(error)); }, diff --git a/src/views/admin/components/edition/item-thumbnail-edition-form.vue b/src/views/admin/components/edition/item-thumbnail-edition-form.vue index 913addf44..09acd4c74 100644 --- a/src/views/admin/components/edition/item-thumbnail-edition-form.vue +++ b/src/views/admin/components/edition/item-thumbnail-edition-form.vue @@ -42,6 +42,7 @@ :src="$thumbHelper.getEmptyThumbnailPlaceholder(item.document_mimetype)"> + :value="form.thumbnail_alt && form.thumbnail_alt != 'false' ? form.thumbnail_alt : ''" + @input="updateThumbnailAlt" />
From f9a9b7c1158a56f4474c4675685b344985cc2142 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Tue, 2 Aug 2022 11:59:25 -0300 Subject: [PATCH 2/2] Fixes text type document insertion flow. --- .../components/edition/item-document-edition-form.vue | 10 +++++++++- .../admin/components/edition/item-edition-form.vue | 5 ++++- .../components/modals/item-document-text-modal.vue | 7 ++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/views/admin/components/edition/item-document-edition-form.vue b/src/views/admin/components/edition/item-document-edition-form.vue index 99d37b333..011bf04aa 100644 --- a/src/views/admin/components/edition/item-document-edition-form.vue +++ b/src/views/admin/components/edition/item-document-edition-form.vue @@ -20,7 +20,8 @@ v-if="form.document != undefined && form.document != null && form.document_type != undefined && form.document_type != null && form.document != '' && form.document_type != 'empty'" - class="document-field-content"> + class="document-field-content" + :class="'document-field-content--' + form.document_type">
@@ -55,6 +55,11 @@ export default { this.$refs['item-document-text-input']['$el'].children[0].focus(); this.$refs['item-document-text-input']['$el'].children[0].click(); } + }, + methods: { + confirmTextWriting() { + this.$emit('confirmTextWriting', this.localTextContent); + } } } \ No newline at end of file