scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 23:16:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix cancel at closing file modal and remove edit button for marvinjs asset [SCI-7061] (#4313)

Browse source
This commit is contained in:
ajugo 2022-08-05 10:46:14 +02:00 committed by GitHub
parent 0579441135
commit 68bbb87797
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/vue/protocol/step_attachments/context_menu.vue
View file

@ -32,7 +32,9 @@
{{ i18n.t('assets.file_preview.edit_in_marvinjs') }}
</a>
</li>
<li v-if="attachment.attributes.image_editable && attachment.attributes.urls.start_edit_image">
<li v-if="attachment.attributes.asset_type != 'marvinjs'
&& attachment.attributes.image_editable
&& attachment.attributes.urls.start_edit_image">
<a class="image-edit-button"
:data-image-id="attachment.id"
:data-image-name="attachment.attributes.file_name"

1
app/javascript/vue/protocol/step_attachments/file_modal.vue
View file

@ -108,6 +108,7 @@
},
methods: {
cancel() {
$(this.$refs.modal).modal('hide');
this.$nextTick(() => this.$emit('cancel'));
},
onImageFilePaste (pasteEvent) {