소스 검색

Include new statuses allowed by workflow in Issues REST API (#24976).

Patch by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@20951 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/5.0.0
Go MAEDA 3 년 전
부모
커밋
9055e5dfe5
3개의 변경된 파일29개의 추가작업 그리고 0개의 파일을 삭제
  1. 1
    0
      app/controllers/issues_controller.rb
  2. 6
    0
      app/views/issues/show.api.rsb
  3. 22
    0
      test/integration/api_test/issues_test.rb

+ 1
- 0
app/controllers/issues_controller.rb 파일 보기

@@ -112,6 +112,7 @@ class IssuesController < ApplicationController
render :template => 'issues/show'
end
format.api do
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
@changesets = @issue.changesets.visible.preload(:repository, :user).to_a
@changesets.reverse! if User.current.wants_comments_in_reverse_order?
end

+ 6
- 0
app/views/issues/show.api.rsb 파일 보기

@@ -77,4 +77,10 @@ api.issue do
api.user :id => user.id, :name => user.name
end
end if include_in_api_response?('watchers') && User.current.allowed_to?(:view_issue_watchers, @issue.project)

api.array :allowed_statuses do
@allowed_statuses.each do |status|
api.status :id => status.id, :name => status.name
end
end if include_in_api_response?('allowed_statuses')
end

+ 22
- 0
test/integration/api_test/issues_test.rb 파일 보기

@@ -394,6 +394,28 @@ class Redmine::ApiTest::IssuesTest < Redmine::ApiTest::Base
end
end

test "GET /issues/:id.xml?include=allowed_statuses should include available statuses" do
issue = Issue.find(1)
assert_equal 1, issue.tracker_id # Bug
issue.update(:status_id => 2) # Assigned
member = Member.find_or_new(issue.project, User.find_by_login('dlopper'))
assert_equal [2], member.role_ids # Developer

get '/issues/1.xml?include=allowed_statuses', :headers => credentials('dlopper', 'foo')
assert_response :ok
assert_equal 'application/xml', response.media_type

allowed_statuses = [[1, 'New'], [2, 'Assigned'], [4, 'Feedback'], [5, 'Closed'], [6, 'Rejected']]
assert_select 'issue allowed_statuses[type=array]' do
assert_select 'status', allowed_statuses.length
assert_select('status').each_with_index do |status, idx|
id, name, = allowed_statuses[idx]
assert_equal id.to_s, status['id']
assert_equal name, status['name']
end
end
end

test "GET /issues/:id.xml should contains total_estimated_hours and total_spent_hours" do
parent = Issue.find(3)
parent.update_columns :estimated_hours => 2.0

Loading…
취소
저장