jro_apps/redmine Commit - r3243:d43c860448ce

Allow commits to reference issues of parent projects and subprojects (#4674)....

Jean-Philippe Lang -

r3243:d43c860448ce

parent child

Context file:

r3243:d43c860448ce

Collapse all files

app/controllers/issues_controller.rb +1 -1

                 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
                 @journals.each_with_index {|j,i| j.indice = i+1}
                 @journals.reverse! if User.current.wants_comments_in_reverse_order?
-                @changesets = @issue.changesets
+                @changesets = @issue.changesets.visible.all
                 @changesets.reverse! if User.current.wants_comments_in_reverse_order?
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)

app/models/changeset.rb +13 -2

               validates_uniqueness_of :revision, :scope => :repository_id
               validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
+              named_scope :visible, lambda {|*args| { :include => {:repository => :project},
+                                                      :conditions => Project.allowed_to_condition(args.first || User.current, :view_changesets) } }
               def revision=(r)
                 write_attribute :revision, (r.nil? ? nil : r.to_s)
               end
                   # find any issue ID in the comments
                   target_issue_ids = []
                   comments.scan(%r{([\s\(\[,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
-                  referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)
+                  referenced_issues += find_referenced_issues_by_id(target_issue_ids)
                 end
                 comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
                   action = match[0]
                   target_issue_ids = match[1].scan(/\d+/)
-                  target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
+                  target_issues = find_referenced_issues_by_id(target_issue_ids)
                   if fix_status && fix_keywords.include?(action.downcase)
                     # update status of issues
                     logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
               private
+              # Finds issues that can be referenced by the commit message
+              # i.e. issues that belong to the repository project, a subproject or a parent project
+              def find_referenced_issues_by_id(ids)
+                Issue.find_all_by_id(ids, :include => :project).select {|issue|
+                  project == issue.project || project.is_ancestor_of?(issue.project) || project.is_descendant_of?(issue.project)
+                }
+              end
               def split_comments
                 comments =~ /\A(.+?)\r?\n(.*)$/m
                 @short_comments = $1 || comments

app/views/issues/show.rhtml +1 -1

             </div>
-            <% if @changesets.any? && User.current.allowed_to?(:view_changesets, @project) %>
+            <% if @changesets.any? %>
             <div id="issue-changesets">
             <h3><%=l(:label_associated_revisions)%></h3>
             <%= render :partial => 'changesets', :locals => { :changesets => @changesets} %>

test/unit/changeset_test.rb +23 0

@@ -74,6 +74,29 class ChangesetTest < ActiveSupport::TestCase
74		74
75	assert_equal [1,2,3], c.issue_ids.sort	75	assert_equal [1,2,3], c.issue_ids.sort
76	end	76	end
		77
		78	def test_commit_referencing_a_subproject_issue
		79	c = Changeset.new(:repository => Project.find(1).repository,
		80	:committed_on => Time.now,
		81	:comments => 'refs #5, a subproject issue')
		82	c.scan_comment_for_issue_ids
		83
		84	assert_equal [5], c.issue_ids.sort
		85	assert c.issues.first.project != c.project
		86	end
		87
		88	def test_commit_referencing_a_parent_project_issue
		89	# repository of child project
		90	r = Repository::Subversion.create!(:project => Project.find(3), :url => 'svn://localhost/test')
		91
		92	c = Changeset.new(:repository => r,
		93	:committed_on => Time.now,
		94	:comments => 'refs #2, an issue of a parent project')
		95	c.scan_comment_for_issue_ids
		96
		97	assert_equal [2], c.issue_ids.sort
		98	assert c.issues.first.project != c.project
		99	end
77		100
78	def test_previous	101	def test_previous
79	changeset = Changeset.find_by_revision('3')	102	changeset = Changeset.find_by_revision('3')

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