From 5aa7fa732675045e13ddd59bdf50e6aebb8290ad Mon Sep 17 00:00:00 2001 From: 1redmine Date: Wed, 25 Jun 2025 10:30:06 +0200 Subject: [PATCH] Rubocop #1601 --- app/controllers/dmsf_workflows_controller.rb | 2 +- lib/redmine_dmsf/hooks/views/issue_view_hooks.rb | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb index af3c5b1f..59003aad 100644 --- a/app/controllers/dmsf_workflows_controller.rb +++ b/app/controllers/dmsf_workflows_controller.rb @@ -216,7 +216,7 @@ class DmsfWorkflowsController < ApplicationController revision = DmsfFileRevision.find_by(id: params[:dmsf_file_revision_id]) begin if revision - @project = revision.dmsf_file.project unless @project + @project ||= revision.dmsf_file.project revision.set_workflow(params[:dmsf_workflow_id], params[:action]) revision.assign_workflow(params[:dmsf_workflow_id]) if request.post? diff --git a/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb b/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb index 2082004d..9c00e06d 100644 --- a/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb +++ b/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb @@ -66,9 +66,7 @@ module RedmineDmsf end end # Upload form - if allowed_to_attach_documents(container) - html << attach_documents_form(context, label: false) - end + html << attach_documents_form(context, label: false) if allowed_to_attach_documents(container) unless allowed_to_attach_attachments(container) html << context[:hook_caller].late_javascript_tag("$('.attachments-container:not(.dmsf-uploader)').hide();") end @@ -122,7 +120,7 @@ module RedmineDmsf end def allowed_to_attach_attachments(container) - return true unless (defined?(EasyExtensions) && container&.project) + return true unless defined?(EasyExtensions) && container&.project !(allowed_to_attach_documents(container) && !container.project.module_enabled?(:documents)) end