summaryrefslogtreecommitdiffstats
path: root/app/views
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2011-07-05 16:47:34 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2011-07-05 16:47:34 +0000
commit42f9dc7d2c5ac27b538ad5f33fcb132437ed5975 (patch)
treee69bf7daf18819f26779cd267c300a7e669eee65 /app/views
parent852cb183b184f65e352f2619250782f6de7dbfd9 (diff)
downloadredmine-42f9dc7d2c5ac27b538ad5f33fcb132437ed5975.tar.gz
redmine-42f9dc7d2c5ac27b538ad5f33fcb132437ed5975.zip
Makes relations resource shallow (#7366).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6184 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views')
-rw-r--r--app/views/issue_relations/show.api.rsb2
-rw-r--r--app/views/issues/_relations.rhtml4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/issue_relations/show.api.rsb b/app/views/issue_relations/show.api.rsb
index 0a3e2918a..bffad94ab 100644
--- a/app/views/issue_relations/show.api.rsb
+++ b/app/views/issue_relations/show.api.rsb
@@ -2,6 +2,6 @@ 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_for(@issue)
+ api.relation_type @relation.relation_type
api.delay @relation.delay
end
diff --git a/app/views/issues/_relations.rhtml b/app/views/issues/_relations.rhtml
index 065f8da9b..12a39ddc4 100644
--- a/app/views/issues/_relations.rhtml
+++ b/app/views/issues/_relations.rhtml
@@ -10,7 +10,7 @@
<form>
<table class="list issues">
<% @relations.each do |relation| %>
-<tr class="issue hascontextmenu">
+<tr class="issue hascontextmenu" id="relation-<%= relation.id %>">
<td class="checkbox"><%= check_box_tag("ids[]", relation.other_issue(@issue).id, false, :id => nil) %></td>
<td class="subject"><%= 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? %>
@@ -19,7 +19,7 @@
<td class="status"><%= relation.other_issue(@issue).status.name %></td>
<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},
+<td class="buttons"><%= link_to_remote(image_tag('link_break.png'), { :url => {:controller => 'issue_relations', :action => 'destroy', :id => relation},
:method => :delete
}, :title => l(:label_relation_delete)) if authorize_for('issue_relations', 'destroy') %></td>
</tr>