redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The DmsfFilesController.view and .show methods did not use the global title format, only the user configured title format.

Browse Source
This commit is contained in:
COLA@Redminetest 2016-11-24 16:32:44 +01:00
parent 7a66ce52a9
commit db885d4edc
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/dmsf_files_controller.rb
View File

@ -52,8 +52,13 @@ class DmsfFilesController < ApplicationController
access.action = DmsfFileRevisionAccess::DownloadAction access.action = DmsfFileRevisionAccess::DownloadAction
access.save! access.save!
member = Member.where(:user_id => User.current.id, :project_id => @file.project.id).first member = Member.where(:user_id => User.current.id, :project_id => @file.project.id).first
if member && !member.title_format.nil? && !member.title_format.empty?
title_format = member.title_format
else
title_format = Setting.plugin_redmine_dmsf['dmsf_global_title_format']
end
send_file(@revision.disk_file, send_file(@revision.disk_file,
:filename => filename_for_content_disposition(@revision.formatted_name(member ? member.title_format : nil)), :filename => filename_for_content_disposition(@revision.formatted_name(title_format)),
:type => @revision.detect_content_type, :type => @revision.detect_content_type,
:disposition => 'inline') :disposition => 'inline')
rescue DmsfAccessError => e rescue DmsfAccessError => e
@ -84,8 +89,13 @@ class DmsfFilesController < ApplicationController
access.action = DmsfFileRevisionAccess::DownloadAction access.action = DmsfFileRevisionAccess::DownloadAction
access.save! access.save!
member = Member.where(:user_id => User.current.id, :project_id => @file.project.id).first member = Member.where(:user_id => User.current.id, :project_id => @file.project.id).first
if member && !member.title_format.nil? && !member.title_format.empty?
title_format = member.title_format
else
title_format = Setting.plugin_redmine_dmsf['dmsf_global_title_format']
end
send_file(@revision.disk_file, send_file(@revision.disk_file,
:filename => filename_for_content_disposition(@revision.formatted_name(member ? member.title_format : nil)), :filename => filename_for_content_disposition(@revision.formatted_name(title_format)),
:type => @revision.detect_content_type, :type => @revision.detect_content_type,
:disposition => 'attachment') :disposition => 'attachment')
rescue DmsfAccessError => e rescue DmsfAccessError => e