diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a9dc836..694c0186 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,8 @@ Changelog for Redmine DMSF Compatibility with Redmine 4.0 Japanese localization updated Plupload & DataTables libraries upgraded - + +* Bug: #1019 - Internal Erro 500 when enable "Act as attachable" and access Activity page * Bug: #1017 - Multiple zip files are filling the tmp folder * Bug: #1015 - WebDAV client error * Bug: #1013 - Approval workflow notifications are sent to locked users diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb index 2ceb9718..a040a4be 100644 --- a/app/models/dmsf_file_revision.rb +++ b/app/models/dmsf_file_revision.rb @@ -58,7 +58,7 @@ class DmsfFileRevision < ActiveRecord::Base ": #{o.dmsf_file.dmsf_path_str}"}, :url => Proc.new {|o| {:controller => 'dmsf_files', :action => 'show', :id => o.dmsf_file}}, :datetime => Proc.new {|o| o.updated_at }, - :description => Proc.new {|o| o.description + "\n" + o.comment }, + :description => Proc.new { |o| "#{o.description}\n#{o.comment}" }, :author => Proc.new {|o| o.user } acts_as_activity_provider :type => 'dmsf_file_revisions', diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css index c513507f..2b9d47c7 100644 --- a/assets/stylesheets/redmine_dmsf.css +++ b/assets/stylesheets/redmine_dmsf.css @@ -289,6 +289,9 @@ div.dmsf_revision_inner_box .attribute .label { .dmsf_gray .icon-file.application-zip { background-image: url(../images/filetypes/zip_gray.png); } .dmsf_gray .icon-file.application-x-gzip { background-image: url(../images/filetypes/zip_gray.png); } +/* Activities */ +.icon-dmsf-file-revision { background-image: url(../../../images/document.png); } + /* Links */ .dmsf_gray { color: #AAA } .dmsf_gray a, .dmsf_gray a:link, .dmsf_gray a:visited{ color: #484848; text-decoration: none; }