summaryrefslogtreecommitdiffstats
path: root/app/views/issues
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-07-04 17:03:04 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-07-04 17:03:04 +0000
commit21b37187445f03c9395f5fc36b5bd1a42d99d980 (patch)
treee2e8b947d3c3b453b5be0a08e5a06e4e57d5a65a /app/views/issues
parent9fca4c440cbcf21a93db943b67acba68b83cf051 (diff)
downloadredmine-21b37187445f03c9395f5fc36b5bd1a42d99d980.tar.gz
redmine-21b37187445f03c9395f5fc36b5bd1a42d99d980.zip
Adds REST API for issue relations (#7366).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6176 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/issues')
-rw-r--r--app/views/issues/_relations.rhtml4
-rw-r--r--app/views/issues/show.api.rsb2
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/issues/_relations.rhtml b/app/views/issues/_relations.rhtml
index 19ae08b04..065f8da9b 100644
--- a/app/views/issues/_relations.rhtml
+++ b/app/views/issues/_relations.rhtml
@@ -20,7 +20,7 @@
<td class="start_date"><%= format_date(relation.other_issue(@issue).start_date) %></td>
<td class="due_date"><%= format_date(relation.other_issue(@issue).due_date) %></td>
<td class="buttons"><%= link_to_remote(image_tag('link_break.png'), { :url => {:controller => 'issue_relations', :action => 'destroy', :issue_id => @issue, :id => relation},
- :method => :post
+ :method => :delete
}, :title => l(:label_relation_delete)) if authorize_for('issue_relations', 'destroy') %></td>
</tr>
<% end %>
@@ -29,7 +29,7 @@
<% end %>
<% remote_form_for(:relation, @relation,
- :url => {:controller => 'issue_relations', :action => 'new', :issue_id => @issue},
+ :url => {:controller => 'issue_relations', :action => 'create', :issue_id => @issue},
:method => :post,
:complete => "Form.Element.focus('relation_issue_to_id');",
:html => {:id => 'new-relation-form', :style => (@relation ? '' : 'display: none;')}) do |f| %>
diff --git a/app/views/issues/show.api.rsb b/app/views/issues/show.api.rsb
index 170aeb375..3493a29cd 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.other_issue(@issue).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_for(@issue), :delay => relation.delay)
end
end if include_in_api_response?('relations') && @relations.present?