jro_apps/redmine Commit - r12141:77665b52523d

Store relation type instead of i18n key in journals (#15704)....

Jean-Philippe Lang -

r12141:77665b52523d

parent child

Context file:

r12141:77665b52523d

Collapse all files

db/migrate/20131215104612_store_relation_type_in_journal_details.rb created 644 +26 0

@@ -0,0 +1,26
	1	class StoreRelationTypeInJournalDetails < ActiveRecord::Migration
	2
	3	MAPPING = {
	4	"label_relates_to" => "relates",
	5	"label_duplicates" => "duplicates",
	6	"label_duplicated_by" => "duplicated",
	7	"label_blocks" => "blocks",
	8	"label_blocked_by" => "blocked",
	9	"label_precedes" => "precedes",
	10	"label_follows" => "follows",
	11	"label_copied_to" => "copied_to",
	12	"label_copied_from" => "copied_from"
	13	}
	14
	15	def up
	16	StoreRelationTypeInJournalDetails::MAPPING.each do \|prop_key, replacement\|
	17	JournalDetail.where(:property => 'relation', :prop_key => prop_key).update_all(:prop_key => replacement)
	18	end
	19	end
	20
	21	def down
	22	StoreRelationTypeInJournalDetails::MAPPING.each do \|prop_key, replacement\|
	23	JournalDetail.where(:property => 'relation', :prop_key => replacement).update_all(:prop_key => prop_key)
	24	end
	25	end
	26	end

app/helpers/issues_helper.rb +2 -1

                     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 })

app/models/issue_relation.rb +4 -4

               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
               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

test/unit/helpers/issues_helper_test.rb +6 -6

               def test_show_detail_relation_added
                 detail = JournalDetail.new(:property => 'relation',
-                                           :prop_key => 'label_precedes',
+                                           :prop_key => 'precedes',
                                            :value    => 1)
                 assert_equal "Precedes Bug #1: Can't print recipes added", show_detail(detail, true)
                 assert_match %r{<strong>Precedes</strong> <i><a href="/issues/1" class=".+">Bug #1</a>: Can&#x27;t print recipes</i> added},
                 inexistant_issue_number = 9999
                 assert_nil  Issue.find_by_id(inexistant_issue_number)
                 detail = JournalDetail.new(:property => 'relation',
-                                           :prop_key => 'label_precedes',
+                                           :prop_key => 'precedes',
                                            :value    => inexistant_issue_number)
                 assert_equal "Precedes Issue ##{inexistant_issue_number} added", show_detail(detail, true)
                 assert_equal "<strong>Precedes</strong> <i>Issue ##{inexistant_issue_number}</i> added", show_detail(detail, false)
               def test_show_detail_relation_added_should_not_disclose_issue_that_is_not_visible
                 issue = Issue.generate!(:is_private => true)
                 detail = JournalDetail.new(:property => 'relation',
-                                           :prop_key => 'label_precedes',
+                                           :prop_key => 'precedes',
                                            :value    => issue.id)
                 assert_equal "Precedes Issue ##{issue.id} added", show_detail(detail, true)
               def test_show_detail_relation_deleted
                 detail = JournalDetail.new(:property  => 'relation',
-                                           :prop_key  => 'label_precedes',
+                                           :prop_key  => 'precedes',
                                            :old_value => 1)
                 assert_equal "Precedes deleted (Bug #1: Can't print recipes)", show_detail(detail, true)
                 assert_match %r{<strong>Precedes</strong> deleted \(<i><a href="/issues/1" class=".+">Bug #1</a>: Can&#x27;t print recipes</i>\)},
                 inexistant_issue_number = 9999
                 assert_nil  Issue.find_by_id(inexistant_issue_number)
                 detail = JournalDetail.new(:property  => 'relation',
-                                           :prop_key  => 'label_precedes',
+                                           :prop_key  => 'precedes',
                                            :old_value => inexistant_issue_number)
                 assert_equal "Precedes deleted (Issue #9999)", show_detail(detail, true)
                 assert_equal "<strong>Precedes</strong> deleted (<i>Issue #9999</i>)", show_detail(detail, false)
               def test_show_detail_relation_deleted_should_not_disclose_issue_that_is_not_visible
                 issue = Issue.generate!(:is_private => true)
                 detail = JournalDetail.new(:property => 'relation',
-                                           :prop_key => 'label_precedes',
+                                           :prop_key => 'precedes',
                                            :old_value    => issue.id)
                 assert_equal "Precedes deleted (Issue ##{issue.id})", show_detail(detail, true)

test/unit/issue_relation_test.rb +4 -4

                 assert_equal from.journals.size, (from_journals + 1)
                 assert_equal to.journals.size, (to_journals + 1)
                 assert_equal 'relation', from.journals.last.details.last.property
-                assert_equal 'label_precedes', from.journals.last.details.last.prop_key
+                assert_equal 'precedes', from.journals.last.details.last.prop_key
                 assert_equal '2', from.journals.last.details.last.value
                 assert_nil   from.journals.last.details.last.old_value
                 assert_equal 'relation', to.journals.last.details.last.property
-                assert_equal 'label_follows', to.journals.last.details.last.prop_key
+                assert_equal 'follows', to.journals.last.details.last.prop_key
                 assert_equal '1', to.journals.last.details.last.value
                 assert_nil   to.journals.last.details.last.old_value
               end
                 assert_equal from.journals.size, (from_journals + 1)
                 assert_equal to.journals.size, (to_journals + 1)
                 assert_equal 'relation', from.journals.last.details.last.property
-                assert_equal 'label_blocks', from.journals.last.details.last.prop_key
+                assert_equal 'blocks', from.journals.last.details.last.prop_key
                 assert_equal '9', from.journals.last.details.last.old_value
                 assert_nil   from.journals.last.details.last.value
                 assert_equal 'relation', to.journals.last.details.last.property
-                assert_equal 'label_blocked_by', to.journals.last.details.last.prop_key
+                assert_equal 'blocked', to.journals.last.details.last.prop_key
                 assert_equal '10', to.journals.last.details.last.old_value
                 assert_nil   to.journals.last.details.last.value
               end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages