#1518 Rails 7

danmunn · May 21, 2024 · f8ebe13 · f8ebe13
1 parent cda9453
commit f8ebe13
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/app/controllers/dmsf_upload_controller.rb b/app/controllers/dmsf_upload_controller.rb
@@ -52,7 +52,7 @@ def upload_files
 
   # 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
@@ -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
@@ -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
@@ -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' %>