From f8ebe13249231ae87246bbf8c9f3bbfeb98848a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= Date: Tue, 21 May 2024 14:12:05 +0200 Subject: [PATCH] #1518 Rails 7 --- app/controllers/dmsf_upload_controller.rb | 2 +- app/views/mailer/_issue.html.erb | 5 +++-- app/views/mailer/_issue.text.erb | 5 +++-- app/views/my/_sidebar.html.erb | 4 +++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/controllers/dmsf_upload_controller.rb b/app/controllers/dmsf_upload_controller.rb index 13ad854a..69e8ebcc 100644 --- a/app/controllers/dmsf_upload_controller.rb +++ b/app/controllers/dmsf_upload_controller.rb @@ -52,7 +52,7 @@ class DmsfUploadController < ApplicationController # REST API and Redmine attachment form def upload - unless request.content_type == 'application/octet-stream' + unless request.media_type == 'application/octet-stream' head :not_acceptable return end diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb index 5e07e33a..d8106120 100644 --- a/app/views/mailer/_issue.html.erb +++ b/app/views/mailer/_issue.html.erb @@ -20,8 +20,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %> -<%= render partial: "/#{File.dirname(__FILE__)}/../../../../../app/views/mailer/issue.html.erb", - locals: { issue: issue, issue_url: issue_url, user: user } %> +<%# Render the original view %> +<% view_paths.unshift Rails.root.join('app/views').to_s %> +<%= render partial: 'issue', locals: { issue: issue, issue_url: issue_url, user: user } %> <%# DMSF extension do %> <% if issue.dmsf_files.any? %> diff --git a/app/views/mailer/_issue.text.erb b/app/views/mailer/_issue.text.erb index 9ffa5345..0086f2aa 100644 --- a/app/views/mailer/_issue.text.erb +++ b/app/views/mailer/_issue.text.erb @@ -20,8 +20,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %> -<%= render partial: "/#{File.dirname(__FILE__)}/../../../../../app/views/mailer/issue.text.erb", - locals: { issue: issue, issue_url: issue_url, user: user } %> +<%# Render the original view %> +<% view_paths.unshift Rails.root.join('app/views').to_s %> +<%= render partial: 'issue', locals: { issue: issue, issue_url: issue_url, user: user } %> <%# DMSF extension do %> <% if issue.dmsf_files.any? %> diff --git a/app/views/my/_sidebar.html.erb b/app/views/my/_sidebar.html.erb index 6510dede..a9d185ba 100644 --- a/app/views/my/_sidebar.html.erb +++ b/app/views/my/_sidebar.html.erb @@ -20,7 +20,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %> -<%= render partial: "/#{File.dirname(__FILE__)}/../../../../../app/views/my/sidebar.html.erb" %> +<%# Render the original view %> +<% view_paths.unshift Rails.root.join('app/views').to_s %> +<%= render partial: 'sidebar' %> <%# DMSF extension do %> <% if Setting.plugin_redmine_dmsf['dmsf_webdav_authentication'] == 'Digest' %>