Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-01 02:46:13 +01:00
Code Issues Packages Projects Releases Activity

Use attribute writers instead of before_create callback to normalize comments and committer (#14534).

Browse Source 
Unlike other adapters, SQLite raises Encoding::UndefinedConversionError before the callback that reencodes attributes is called.

git-svn-id: http://svn.redmine.org/redmine/trunk@13896 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-01-18 11:43:58 +00:00
parent 886b9c14d0
commit 0bcd5be0a5
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/changeset.rb
View File

@@ -69,6 +69,16 @@ class Changeset < ActiveRecord::Base
end
end
def committer=(arg)
write_attribute :committer,
self.class.to_utf8(arg, repository.try(:repo_log_encoding))
end
def comments=(arg)
write_attribute :comments,
self.class.normalize_comments(arg, repository.try(:repo_log_encoding))
end
def committed_on=(date)
self.commit_date = date
super
@@ -92,9 +102,7 @@ class Changeset < ActiveRecord::Base
end
def before_create_cs
self.committer = self.class.to_utf8(self.committer, repository.repo_log_encoding)
self.comments = self.class.normalize_comments(
self.comments, repository.repo_log_encoding)
self.comments ||= ''
self.user = repository.find_committer_user(self.committer)
end