From c53e8735b192e124f7cdc22e405f194afa3e3735 Mon Sep 17 00:00:00 2001 From: "COLA@Redminetest" Date: Thu, 24 Nov 2016 17:02:03 +0100 Subject: [PATCH] The display_name should also use the formatted_name. --- app/models/dmsf_file.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index e6f72e5c..04e3d10a 100644 --- a/app/models/dmsf_file.rb +++ b/app/models/dmsf_file.rb @@ -403,10 +403,17 @@ class DmsfFile < ActiveRecord::Base end def display_name - if self.name.length > 50 - return "#{self.name[0, 25]}...#{self.name[-25, 25]}" + member = Member.where(:user_id => User.current.id, :project_id => self.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 - self.name + fname = formatted_name(title_format) + if fname.length > 50 + return "#{fname[0, 25]}...#{fname[-25, 25]}" + end + fname end def image?