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

after upgrade 1.5.1 -> 1.5.2. 'top level based search' results in http:500 when 'Documents' is included #408

Browse Source
This commit is contained in:
Karel Pičman 2015-07-23 15:17:23 +02:00
parent 60b2d2fe78
commit dfe405daf5
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/models/dmsf_file.rb
View File

@ -79,6 +79,10 @@ class DmsfFile < ActiveRecord::Base
errors.add(:name, l('activerecord.errors.messages.taken')) unless
existing_file.nil? || existing_file.id == self.id
end
if (Rails::VERSION::MAJOR <= 3)
attr_accessor :event_description
end
acts_as_event :title => Proc.new { |o| o.name },
:description => Proc.new { |o|
@ -92,9 +96,12 @@ class DmsfFile < ActiveRecord::Base
desc += o.last_revision.comment if o.last_revision.comment.present?
end
else
desc = o.description
desc += ' / ' if o.description.present? && o.last_revision.comment.present?
desc += o.last_revision.comment if o.last_revision.comment.present?
desc = o.event_description
unless desc.present?
desc = o.description
desc += ' / ' if o.description.present? && o.last_revision.comment.present?
desc += o.last_revision.comment if o.last_revision.comment.present?
end
end
desc
},
@ -402,7 +409,7 @@ class DmsfFile < ActiveRecord::Base
Redmine::Search.cache_store.write("DmsfFile-#{dmsf_file.id}",
dochash['sample'].force_encoding('UTF-8')) if dochash['sample']
else
dmsf_file.description = dochash['sample'].force_encoding('UTF-8') if dochash['sample']
dmsf_file.event_description = dochash['sample'].force_encoding('UTF-8') if dochash['sample']
end
break if(!options[:limit].blank? && results.count >= options[:limit])
results << dmsf_file