From 6dce426db416e0b2af40a96618cb411568d2dee1 Mon Sep 17 00:00:00 2001 From: Anton Date: Wed, 11 May 2022 16:08:04 +0200 Subject: [PATCH] Add tinyMce field to protocol [SCI-6810] --- .../stylesheets/my_modules/protocol.scss | 8 ++++++++ .../stylesheets/steps/components/text.scss | 15 ++++++-------- app/controllers/my_modules_controller.rb | 6 +++--- app/javascript/vue/protocol/container.vue | 17 +++++++++++++++- app/serializers/protocol_serializer.rb | 20 ++++++++++++++++++- 5 files changed, 52 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/my_modules/protocol.scss b/app/assets/stylesheets/my_modules/protocol.scss index 9b76a9850..074c08d46 100644 --- a/app/assets/stylesheets/my_modules/protocol.scss +++ b/app/assets/stylesheets/my_modules/protocol.scss @@ -37,4 +37,12 @@ } } } + .tinymce-container { + display: flex; + width: 100%; + + .tiny-mce-editor { + flex-basis: 100%; + } + } } diff --git a/app/assets/stylesheets/steps/components/text.scss b/app/assets/stylesheets/steps/components/text.scss index 03de87be5..0b6b1bb22 100644 --- a/app/assets/stylesheets/steps/components/text.scss +++ b/app/assets/stylesheets/steps/components/text.scss @@ -6,7 +6,6 @@ position: relative; width: calc(100% + 16px); - .action-container { cursor: pointer; height: 100%; @@ -16,7 +15,12 @@ z-index: 100; .buttons-container { - background: linear-gradient(90deg, transparent 0%, $color-concrete 25%, $color-concrete 100%); + background: linear-gradient( + 90deg, + transparent 0%, + $color-concrete 25%, + $color-concrete 100% + ); display: none; padding-left: 2em; position: absolute; @@ -36,15 +40,8 @@ } .tinymce-container { - display: flex; - width: 100%; - .tinymce-status-badge { display: none; - }; - - .tiny-mce-editor { - flex-basis: 100%; } .tinymce-view { diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb index f52786623..0d6641413 100644 --- a/app/controllers/my_modules_controller.rb +++ b/app/controllers/my_modules_controller.rb @@ -263,14 +263,14 @@ class MyModulesController < ApplicationController end def protocol - render json: @my_module.protocol, serializer: ProtocolSerializer + render json: @my_module.protocol, serializer: ProtocolSerializer, user: current_user end def update_protocol protocol = @my_module.protocol protocol.update!(protocol_params) - render json: protocol, serializer: ProtocolSerializer + render json: protocol, serializer: ProtocolSerializer, user: current_user end def results @@ -403,7 +403,7 @@ class MyModulesController < ApplicationController end def protocol_params - params.require(:protocol).permit(:name) + params.require(:protocol).permit(:name, :description) end def update_status_params diff --git a/app/javascript/vue/protocol/container.vue b/app/javascript/vue/protocol/container.vue index a51aa1b4e..66e33ca24 100644 --- a/app/javascript/vue/protocol/container.vue +++ b/app/javascript/vue/protocol/container.vue @@ -34,6 +34,17 @@ @update="updateName" /> +