jro_apps/redmine Commit - r4650:7be5bf6e4da8

Merged r4741 and r4764 from trunk....

Jean-Philippe Lang -

r4650:7be5bf6e4da8

parent child

Context file:

r4650:7be5bf6e4da8

app/controllers/issue_relations_controller.rb +5 -1

                 respond_to do |format|
                   format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
                   format.js do
+                    @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
                     render :update do |page|
                       page.replace_html "relations", :partial => 'issues/relations'
                       if @relation.errors.empty?
                 end
                 respond_to do |format|
                   format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
-                  format.js { render(:update) {|page| page.replace_html "relations", :partial => 'issues/relations'} }
+                  format.js {
+                    @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
+                    render(:update) {|page| page.replace_html "relations", :partial => 'issues/relations'}
+                  }
                 end
               end

app/controllers/issues_controller.rb +1 0

                 @journals.reverse! if User.current.wants_comments_in_reverse_order?
                 @changesets = @issue.changesets.visible.all
                 @changesets.reverse! if User.current.wants_comments_in_reverse_order?
+                @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
                 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
                 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
                 @priorities = IssuePriority.all

app/views/issues/_relations.rhtml +2 -2

             <p><strong><%=l(:label_related_issues)%></strong></p>
-            <% if @issue.relations.any? %>
+            <% if @relations.present? %>
             <table style="width:100%">
-            <% @issue.relations.select {|r| r.other_issue(@issue).visible? }.each do |relation| %>
+            <% @relations.each do |relation| %>
             <tr>
             <td><%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %>
                 <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %>

app/views/issues/show.api.rsb +2 -2

               render_api_issue_children(@issue, api) if include_in_api_response?('children')
               api.array :relations do
-                @issue.relations.select {|r| r.other_issue(@issue).visible? }.each do |relation|
+                @relations.each do |relation|
                   api.relation(:id => relation.id, :issue_id => relation.other_issue(@issue).id, :relation_type => relation.relation_type_for(@issue), :delay => relation.delay)
                 end
-              end if include_in_api_response?('relations')
+              end if include_in_api_response?('relations') && @relations.present?
               api.array :changesets do
                 @issue.changesets.each do |changeset|

test/functional/issue_relations_controller_test.rb +29 0

@@ -33,6 +33,19 class IssueRelationsControllerTest < ActionController::TestCase
33	end	33	end
34	end	34	end
35		35
		36	def test_new_xhr
		37	assert_difference 'IssueRelation.count' do
		38	@request.session[:user_id] = 3
		39	xhr :post, :new,
		40	:issue_id => 3,
		41	:relation => {:issue_to_id => '1', :relation_type => 'relates', :delay => ''}
		42	assert_select_rjs 'relations' do
		43	assert_select 'table', 1
		44	assert_select 'tr', 2 # relations
		45	end
		46	end
		47	end
		48
36	def test_new_should_accept_id_with_hash	49	def test_new_should_accept_id_with_hash
37	assert_difference 'IssueRelation.count' do	50	assert_difference 'IssueRelation.count' do
38	@request.session[:user_id] = 3	51	@request.session[:user_id] = 3
@@ -68,4 +81,20 class IssueRelationsControllerTest < ActionController::TestCase
68	post :destroy, :id => '2', :issue_id => '3'	81	post :destroy, :id => '2', :issue_id => '3'
69	end	82	end
70	end	83	end
		84
		85	def test_destroy_xhr
		86	IssueRelation.create!(:relation_type => IssueRelation::TYPE_RELATES) do \|r\|
		87	r.issue_from_id = 3
		88	r.issue_to_id = 1
		89	end
		90
		91	assert_difference 'IssueRelation.count', -1 do
		92	@request.session[:user_id] = 3
		93	xhr :post, :destroy, :id => '2', :issue_id => '3'
		94	assert_select_rjs 'relations' do
		95	assert_select 'table', 1
		96	assert_select 'tr', 1 # relation left
		97	end
		98	end
		99	end
71	end	100	end

General Comments 0

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

No TODOs yet

	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