From 3443a6fb852dcacee7f38dcc49f557b6845d5a79 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Wed, 22 Mar 2023 12:52:08 +0100 Subject: [PATCH] Fix create step comments permissions [SCI-8174] --- app/controllers/comments_controller.rb | 4 ++-- app/helpers/comment_helper.rb | 4 ++-- app/views/steps/_comments.html.erb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 5451e6b74..cda00411a 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -102,9 +102,9 @@ class CommentsController < ApplicationController when MyModule render_403 and return unless can_create_my_module_comments?(@commentable) when Step - render_403 and return unless can_create_my_module_comments?(@commentable.protocol.my_module) + render_403 and return unless can_create_comments_in_my_module_steps?(@commentable.protocol.my_module) when Result - render_403 and return unless can_create_my_module_comments?(@commentable.my_module) + render_403 and return unless can_create_my_module_result_comments?(@commentable.my_module) else render_403 and return end diff --git a/app/helpers/comment_helper.rb b/app/helpers/comment_helper.rb index 2a17dc6af..a7c8c33c5 100644 --- a/app/helpers/comment_helper.rb +++ b/app/helpers/comment_helper.rb @@ -62,9 +62,9 @@ module CommentHelper when 'MyModule' can_create_my_module_comments?(object) when 'Step' - can_create_my_module_comments?(object.my_module) + can_create_comments_in_my_module_steps?(object.my_module) when 'Result' - can_create_my_module_comments?(object.my_module) + can_create_my_module_result_comments?(object.my_module) when 'Project' can_create_project_comments?(object) else diff --git a/app/views/steps/_comments.html.erb b/app/views/steps/_comments.html.erb index 490bc61ab..d02293ae0 100644 --- a/app/views/steps/_comments.html.erb +++ b/app/views/steps/_comments.html.erb @@ -10,7 +10,7 @@ <%= render partial: 'shared/comments/comments.html.erb', locals: { object: step, comments: comments, - can_create_comments: can_create_my_module_comments?(@protocol.my_module), + can_create_comments: can_create_comments_in_my_module_steps?(@protocol.my_module), create_url: step_step_comments_path(step, format: :json), more_url: step_step_comments_path(step, format: :json, from: comments.first&.id) } %>