diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-07-04 17:44:41 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-07-04 17:44:41 +0000 |
| commit | daa426167f2ce2cb9e044d340ed4ba42cfe599f6 (patch) | |
| tree | 71ddd887c78b95ca4928f404e9290ed6c6502160 /app | |
| parent | 79f25c08f8ce46ea19c1b172ffa0a56fab3c92f7 (diff) | |
| download | redmine-daa426167f2ce2cb9e044d340ed4ba42cfe599f6.tar.gz redmine-daa426167f2ce2cb9e044d340ed4ba42cfe599f6.zip | |
Adds support for GET on /issues/:issue_id/relations (#7366).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6179 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/issue_relations_controller.rb | 11 | ||||
| -rw-r--r-- | app/views/issue_relations/index.api.rsb | 11 | ||||
| -rw-r--r-- | app/views/issues/show.api.rsb | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/app/controllers/issue_relations_controller.rb b/app/controllers/issue_relations_controller.rb index 094036768..36ee8d6d7 100644 --- a/app/controllers/issue_relations_controller.rb +++ b/app/controllers/issue_relations_controller.rb @@ -17,7 +17,16 @@ class IssueRelationsController < ApplicationController before_filter :find_issue, :find_project_from_association, :authorize - accept_key_auth :show, :create, :destroy + accept_key_auth :index, :show, :create, :destroy + + def index + @relations = @issue.relations + + respond_to do |format| + format.html { render :nothing => true } + format.api + end + end def show @relation = @issue.find_relation(params[:id]) diff --git a/app/views/issue_relations/index.api.rsb b/app/views/issue_relations/index.api.rsb new file mode 100644 index 000000000..379481dcc --- /dev/null +++ b/app/views/issue_relations/index.api.rsb @@ -0,0 +1,11 @@ +api.array :relations do + @relations.each do |relation| + api.relation do + api.id relation.id + api.issue_id relation.issue_from_id + api.issue_to_id relation.issue_to_id + api.relation_type relation.relation_type + api.delay relation.delay + end + end +end diff --git a/app/views/issues/show.api.rsb b/app/views/issues/show.api.rsb index 3493a29cd..9d98959a9 100644 --- a/app/views/issues/show.api.rsb +++ b/app/views/issues/show.api.rsb @@ -27,7 +27,7 @@ api.issue do 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? |