jro_apps/redmine Commit - r8997:41dba6864aa0

Merged r8917 from trunk....

Jean-Philippe Lang -

r8997:41dba6864aa0

parent child

Context file:

r8997:41dba6864aa0

Collapse all files

app/models/changeset.rb +8 -4

                 @long_comments || split_comments.last
               end
-              def text_tag
+              def text_tag(ref_project=nil)
-                if scmid?
+                tag = if scmid?
                   "commit:#{scmid}"
                 else
                   "r#{revision}"
                 end
+                if ref_project && project && ref_project != project
+                  tag = "#{project.identifier}:#{tag}"
+                end
+                tag
               end
               # Returns the previous changeset
                 # don't change the status is the issue is closed
                 return if issue.status && issue.status.is_closed?
-                journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, text_tag))
+                journal = issue.init_journal(user || User.anonymous, ll(Setting.default_language, :text_status_changed_by_changeset, text_tag(issue.project)))
                 issue.status = status
                 unless Setting.commit_fix_done_ratio.blank?
                   issue.done_ratio = Setting.commit_fix_done_ratio.to_i
                   :hours => hours,
                   :issue => issue,
                   :spent_on => commit_date,
-                  :comments => l(:text_time_logged_by_changeset, :value => text_tag,
+                  :comments => l(:text_time_logged_by_changeset, :value => text_tag(issue.project),
                                  :locale => Setting.default_language)
                   )
                 time_entry.activity = log_time_activity unless log_time_activity.nil?

test/unit/changeset_test.rb +38 0

@@ -178,6 +178,24 class ChangesetTest < ActiveSupport::TestCase
178	assert c.issues.first.project != c.project	178	assert c.issues.first.project != c.project
179	end	179	end
180		180
		181	def test_commit_closing_a_subproject_issue
		182	with_settings :commit_fix_status_id => 5, :commit_fix_keywords => 'closes' do
		183	issue = Issue.find(5)
		184	assert !issue.closed?
		185	assert_difference 'Journal.count' do
		186	c = Changeset.new(:repository => Project.find(1).repository,
		187	:committed_on => Time.now,
		188	:comments => 'closes #5, a subproject issue',
		189	:revision => '12345')
		190	assert c.save
		191	end
		192	assert issue.reload.closed?
		193	journal = Journal.first(:order => 'id DESC')
		194	assert_equal issue, journal.issue
		195	assert_include "Applied in changeset ecookbook:r12345.", journal.notes
		196	end
		197	end
		198
181	def test_commit_referencing_a_parent_project_issue	199	def test_commit_referencing_a_parent_project_issue
182	# repository of child project	200	# repository of child project
183	r = Repository::Subversion.create!(	201	r = Repository::Subversion.create!(
@@ -197,6 +215,16 class ChangesetTest < ActiveSupport::TestCase
197	assert_equal 'r520', c.text_tag	215	assert_equal 'r520', c.text_tag
198	end	216	end
199		217
		218	def test_text_tag_revision_with_same_project
		219	c = Changeset.new(:revision => '520', :repository => Project.find(1).repository)
		220	assert_equal 'r520', c.text_tag(Project.find(1))
		221	end
		222
		223	def test_text_tag_revision_with_different_project
		224	c = Changeset.new(:revision => '520', :repository => Project.find(1).repository)
		225	assert_equal 'ecookbook:r520', c.text_tag(Project.find(2))
		226	end
		227
200	def test_text_tag_hash	228	def test_text_tag_hash
201	c = Changeset.new(	229	c = Changeset.new(
202	:scmid => '7234cb2750b63f47bff735edc50a1c0a433c2518',	230	:scmid => '7234cb2750b63f47bff735edc50a1c0a433c2518',
@@ -204,6 +232,16 class ChangesetTest < ActiveSupport::TestCase
204	assert_equal 'commit:7234cb2750b63f47bff735edc50a1c0a433c2518', c.text_tag	232	assert_equal 'commit:7234cb2750b63f47bff735edc50a1c0a433c2518', c.text_tag
205	end	233	end
206		234
		235	def test_text_tag_hash_with_same_project
		236	c = Changeset.new(:revision => '7234cb27', :scmid => '7234cb27', :repository => Project.find(1).repository)
		237	assert_equal 'commit:7234cb27', c.text_tag(Project.find(1))
		238	end
		239
		240	def test_text_tag_hash_with_different_project
		241	c = Changeset.new(:revision => '7234cb27', :scmid => '7234cb27', :repository => Project.find(1).repository)
		242	assert_equal 'ecookbook:commit:7234cb27', c.text_tag(Project.find(2))
		243	end
		244
207	def test_text_tag_hash_all_number	245	def test_text_tag_hash_all_number
208	c = Changeset.new(:scmid => '0123456789', :revision => '0123456789')	246	c = Changeset.new(:scmid => '0123456789', :revision => '0123456789')
209	assert_equal 'commit:0123456789', c.text_tag	247	assert_equal 'commit:0123456789', c.text_tag

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