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
-                 if scmid?
+               def text_tag(ref_project=nil)
+                 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

                  assert c.issues.first.project != c.project
                end
+               def test_commit_closing_a_subproject_issue
+                 with_settings :commit_fix_status_id => 5, :commit_fix_keywords => 'closes' do
+                   issue = Issue.find(5)
+                   assert !issue.closed?
+                   assert_difference 'Journal.count' do
+                     c = Changeset.new(:repository   => Project.find(1).repository,
+                                       :committed_on => Time.now,
+                                       :comments     => 'closes #5, a subproject issue',
+                                       :revision     => '12345')
+                     assert c.save
+                   end
+                   assert issue.reload.closed?
+                   journal = Journal.first(:order => 'id DESC')
+                   assert_equal issue, journal.issue
+                   assert_include "Applied in changeset ecookbook:r12345.", journal.notes
+                 end
+               end
                def test_commit_referencing_a_parent_project_issue
                  # repository of child project
                  r = Repository::Subversion.create!(
                  assert_equal 'r520', c.text_tag
                end
+               def test_text_tag_revision_with_same_project
+                 c = Changeset.new(:revision => '520', :repository => Project.find(1).repository)
+                 assert_equal 'r520', c.text_tag(Project.find(1))
+               end
+               def test_text_tag_revision_with_different_project
+                 c = Changeset.new(:revision => '520', :repository => Project.find(1).repository)
+                 assert_equal 'ecookbook:r520', c.text_tag(Project.find(2))
+               end
                def test_text_tag_hash
                  c = Changeset.new(
                        :scmid    => '7234cb2750b63f47bff735edc50a1c0a433c2518',
                  assert_equal 'commit:7234cb2750b63f47bff735edc50a1c0a433c2518', c.text_tag
                end
+               def test_text_tag_hash_with_same_project
+                 c = Changeset.new(:revision => '7234cb27', :scmid => '7234cb27', :repository => Project.find(1).repository)
+                 assert_equal 'commit:7234cb27', c.text_tag(Project.find(1))
+               end
+               def test_text_tag_hash_with_different_project
+                 c = Changeset.new(:revision => '7234cb27', :scmid => '7234cb27', :repository => Project.find(1).repository)
+                 assert_equal 'ecookbook:commit:7234cb27', c.text_tag(Project.find(2))
+               end
                def test_text_tag_hash_all_number
                  c = Changeset.new(:scmid => '0123456789', :revision => '0123456789')
                  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