From 68bbb87797e9e94da7fbbb365e570c7c52284cea Mon Sep 17 00:00:00 2001
From: ajugo <andrej.jugovic7@gmail.com>
Date: Fri, 5 Aug 2022 10:46:14 +0200
Subject: [PATCH] Fix cancel at closing file modal and remove edit button for
 marvinjs asset [SCI-7061] (#4313)

---
 app/javascript/vue/protocol/step_attachments/context_menu.vue | 4 +++-
 app/javascript/vue/protocol/step_attachments/file_modal.vue   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/javascript/vue/protocol/step_attachments/context_menu.vue b/app/javascript/vue/protocol/step_attachments/context_menu.vue
index cd06b7b7b..22d3a6147 100644
--- a/app/javascript/vue/protocol/step_attachments/context_menu.vue
+++ b/app/javascript/vue/protocol/step_attachments/context_menu.vue
@@ -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"
diff --git a/app/javascript/vue/protocol/step_attachments/file_modal.vue b/app/javascript/vue/protocol/step_attachments/file_modal.vue
index 3d649e705..44c7f5d07 100644
--- a/app/javascript/vue/protocol/step_attachments/file_modal.vue
+++ b/app/javascript/vue/protocol/step_attachments/file_modal.vue
@@ -108,6 +108,7 @@
     },
     methods: {
       cancel() {
+        $(this.$refs.modal).modal('hide');
         this.$nextTick(() => this.$emit('cancel'));
       },
       onImageFilePaste (pasteEvent) {