jro_apps/redmine Commit - r6059:daa426167f2c

Adds support for GET on /issues/:issue_id/relations (#7366)....

Jean-Philippe Lang -

r6059:daa426167f2c

parent child

Context file:

r6059:daa426167f2c

app/views/issue_relations/index.api.rsb created 644 +11 0

@@ -0,0 +1,11
	1	api.array :relations do
	2	@relations.each do \|relation\|
	3	api.relation do
	4	api.id relation.id
	5	api.issue_id relation.issue_from_id
	6	api.issue_to_id relation.issue_to_id
	7	api.relation_type relation.relation_type
	8	api.delay relation.delay
	9	end
	10	end
	11	end

app/controllers/issue_relations_controller.rb +10 -1

@@ -17,7 +17,16
17		17
18	class IssueRelationsController < ApplicationController	18	class IssueRelationsController < ApplicationController
19	before_filter :find_issue, :find_project_from_association, :authorize	19	before_filter :find_issue, :find_project_from_association, :authorize
20	accept_key_auth :show, :create, :destroy	20	accept_key_auth :index, :show, :create, :destroy
		21
		22	def index
		23	@relations = @issue.relations
		24
		25	respond_to do \|format\|
		26	format.html { render :nothing => true }
		27	format.api
		28	end
		29	end
21		30
22	def show	31	def show
23	@relation = @issue.find_relation(params[:id])	32	@relation = @issue.find_relation(params[:id])

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

               api.array :relations do
                 @relations.each do |relation|
-                  api.relation(:id => relation.id, :issue_id => relation.issue_from_id, :issue_to_id => relation.issue_to_id, :relation_type => relation.relation_type_for(@issue), :delay => relation.delay)
+                  api.relation(:id => relation.id, :issue_id => relation.issue_from_id, :issue_to_id => relation.issue_to_id, :relation_type => relation.relation_type, :delay => relation.delay)
                 end
               end if include_in_api_response?('relations') && @relations.present?

config/routes.rb +1 -1

               map.resources :issues, :member => { :edit => :post }, :collection => {} do |issues|
                 issues.resources :time_entries, :controller => 'timelog'
-                issues.resources :relations, :controller => 'issue_relations', :only => [:show, :create, :destroy]
+                issues.resources :relations, :controller => 'issue_relations', :only => [:index, :show, :create, :destroy]
               end
               map.resources :issues, :path_prefix => '/projects/:project_id', :collection => { :create => :post } do |issues|

lib/redmine.rb +1 -1

                                               :reports => [:issue_report, :issue_report_details]}
                 map.permission :add_issues, {:issues => [:new, :create, :update_form]}
                 map.permission :edit_issues, {:issues => [:edit, :update, :bulk_edit, :bulk_update, :update_form], :journals => [:new]}
-                map.permission :manage_issue_relations, {:issue_relations => [:show, :create, :destroy]}
+                map.permission :manage_issue_relations, {:issue_relations => [:index, :show, :create, :destroy]}
                 map.permission :manage_subtasks, {}
                 map.permission :set_issues_private, {}
                 map.permission :set_own_issues_private, {}, :require => :loggedin

test/integration/api_test/issue_relations_test.rb +19 0

@@ -25,6 +25,25 class ApiTest::IssueRelationsTest < ActionController::IntegrationTest
25	end	25	end
26		26
27	context "/issues/:issue_id/relations" do	27	context "/issues/:issue_id/relations" do
		28	context "GET" do
		29	should "return issue relations" do
		30	get '/issues/9/relations.xml', {}, :authorization => credentials('jsmith')
		31
		32	assert_response :success
		33	assert_equal 'application/xml', @response.content_type
		34
		35	assert_tag :tag => 'relations',
		36	:attributes => { :type => 'array' },
		37	:child => {
		38	:tag => 'relation',
		39	:child => {
		40	:tag => 'id',
		41	:content => '1'
		42	}
		43	}
		44	end
		45	end
		46
28	context "POST" do	47	context "POST" do
29	should "create a relation" do	48	should "create a relation" do
30	assert_difference('IssueRelation.count') do	49	assert_difference('IssueRelation.count') do

test/integration/routing_test.rb +4 0

               end
               context "issue relations" do
+                should_route :get, "/issues/1/relations", :controller => 'issue_relations', :action => 'index', :issue_id => '1'
+                should_route :get, "/issues/1/relations.xml", :controller => 'issue_relations', :action => 'index', :issue_id => '1', :format => 'xml'
+                should_route :get, "/issues/1/relations.json", :controller => 'issue_relations', :action => 'index', :issue_id => '1', :format => 'json'
                 should_route :post, "/issues/1/relations", :controller => 'issue_relations', :action => 'create', :issue_id => '1'
                 should_route :post, "/issues/1/relations.xml", :controller => 'issue_relations', :action => 'create', :issue_id => '1', :format => 'xml'
                 should_route :post, "/issues/1/relations.json", :controller => 'issue_relations', :action => 'create', :issue_id => '1', :format => 'json'

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