##// END OF EJS Templates
jro_apps » redmine
RSS
Moves relations fetching from views to the controller and skip invalid relations (#7385)....
Jean-Philippe Lang -
r4621:b8dee485ca04
parent child
Show More
Side by Side Unified
Context file:
r4621:b8dee485ca04 Loading diff...:
Show file before | Show file after | Hide comments
@@ -108,6 +108,7 class IssuesController < ApplicationController
108 @journals.reverse! if User.current.wants_comments_in_reverse_order?
108 @journals.reverse! if User.current.wants_comments_in_reverse_order?
109 @changesets = @issue.changesets.visible.all
109 @changesets = @issue.changesets.visible.all
110 @changesets.reverse! if User.current.wants_comments_in_reverse_order?
110 @changesets.reverse! if User.current.wants_comments_in_reverse_order?
111 @relations = @issue.relations.select {|r| r.other_issue(@issue) && r.other_issue(@issue).visible? }
111 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
112 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
112 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
113 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
113 @priorities = IssuePriority.all
114 @priorities = IssuePriority.all
Show file before | Show file after | Hide comments
@@ -6,9 +6,9
6
6
7 <p><strong><%=l(:label_related_issues)%></strong></p>
7 <p><strong><%=l(:label_related_issues)%></strong></p>
8
8
9 <% if @issue.relations.any? %>
9 <% if @relations.present? %>
10 <table style="width:100%">
10 <table style="width:100%">
11 <% @issue.relations.select {|r| r.other_issue(@issue).visible? }.each do |relation| %>
11 <% @relations.each do |relation| %>
12 <tr>
12 <tr>
13 <td><%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %>
13 <td><%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %>
14 <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %>
14 <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %>
Show file before | Show file after | Hide comments
@@ -26,10 +26,10 api.issue do
26 render_api_issue_children(@issue, api) if include_in_api_response?('children')
26 render_api_issue_children(@issue, api) if include_in_api_response?('children')
27
27
28 api.array :relations do
28 api.array :relations do
29 @issue.relations.select {|r| r.other_issue(@issue).visible? }.each do |relation|
29 @relations.each do |relation|
30 api.relation(:id => relation.id, :issue_id => relation.other_issue(@issue).id, :relation_type => relation.relation_type_for(@issue), :delay => relation.delay)
30 api.relation(:id => relation.id, :issue_id => relation.other_issue(@issue).id, :relation_type => relation.relation_type_for(@issue), :delay => relation.delay)
31 end
31 end
32 end if include_in_api_response?('relations')
32 end if include_in_api_response?('relations') && @relations.present?
33
33
34 api.array :changesets do
34 api.array :changesets do
35 @issue.changesets.each do |changeset|
35 @issue.changesets.each do |changeset|
General Comments 0
You need to be logged in to leave comments. Login now