diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-12-15 11:02:24 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-12-15 11:02:24 +0000 |
| commit | 77665b52523d13532c16c97090b83c7ef88e2b62 (patch) | |
| tree | 1cdc7cc7be982e543bda47d47efaeb8c60966e6f /app | |
| parent | 13756eb3a830e04493ebc048ae72e9271df4411c (diff) | |
| download | redmine-77665b52523d13532c16c97090b83c7ef88e2b62.tar.gz redmine-77665b52523d13532c16c97090b83c7ef88e2b62.zip | |
Store relation type instead of i18n key in journals (#15704).
git-svn-id: http://svn.redmine.org/redmine/trunk@12416 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/issues_helper.rb | 3 | ||||
| -rw-r--r-- | app/models/issue_relation.rb | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index ed1d243fb..05cc84471 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -340,7 +340,8 @@ module IssuesHelper old_value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.old_value}" : (no_html ? rel_issue : link_to_issue(rel_issue, :only_path => options[:only_path])) end - label = l(detail.prop_key.to_sym) + relation_type = IssueRelation::TYPES[detail.prop_key] + label = l(relation_type[:name]) if relation_type end call_hook(:helper_issues_show_detail_after_setting, {:detail => detail, :label => label, :value => value, :old_value => old_value }) diff --git a/app/models/issue_relation.rb b/app/models/issue_relation.rb index 1de565011..90a660436 100644 --- a/app/models/issue_relation.rb +++ b/app/models/issue_relation.rb @@ -185,12 +185,12 @@ class IssueRelation < ActiveRecord::Base def create_journal_after_create journal = issue_from.init_journal(User.current) journal.details << JournalDetail.new(:property => 'relation', - :prop_key => label_for(issue_from).to_s, + :prop_key => relation_type_for(issue_from), :value => issue_to.id) journal.save journal = issue_to.init_journal(User.current) journal.details << JournalDetail.new(:property => 'relation', - :prop_key => label_for(issue_to).to_s, + :prop_key => relation_type_for(issue_to), :value => issue_from.id) journal.save end @@ -198,12 +198,12 @@ class IssueRelation < ActiveRecord::Base def create_journal_after_delete journal = issue_from.init_journal(User.current) journal.details << JournalDetail.new(:property => 'relation', - :prop_key => label_for(issue_from).to_s, + :prop_key => relation_type_for(issue_from), :old_value => issue_to.id) journal.save journal = issue_to.init_journal(User.current) journal.details << JournalDetail.new(:property => 'relation', - :prop_key => label_for(issue_to).to_s, + :prop_key => relation_type_for(issue_to), :old_value => issue_from.id) journal.save end |