##// END OF EJS Templates
Moves relations fetching from views to the controller and skip invalid relations (#7385)....
Jean-Philippe Lang -
r4621:b8dee485ca04
parent child
Show More
@@ -1,318 +1,319
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2008 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class IssuesController < ApplicationController
19 19 menu_item :new_issue, :only => [:new, :create]
20 20 default_search_scope :issues
21 21
22 22 before_filter :find_issue, :only => [:show, :edit, :update]
23 23 before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :move, :perform_move, :destroy]
24 24 before_filter :check_project_uniqueness, :only => [:move, :perform_move]
25 25 before_filter :find_project, :only => [:new, :create]
26 26 before_filter :authorize, :except => [:index]
27 27 before_filter :find_optional_project, :only => [:index]
28 28 before_filter :check_for_default_issue_status, :only => [:new, :create]
29 29 before_filter :build_new_issue_from_params, :only => [:new, :create]
30 30 accept_key_auth :index, :show, :create, :update, :destroy
31 31
32 32 rescue_from Query::StatementInvalid, :with => :query_statement_invalid
33 33
34 34 helper :journals
35 35 helper :projects
36 36 include ProjectsHelper
37 37 helper :custom_fields
38 38 include CustomFieldsHelper
39 39 helper :issue_relations
40 40 include IssueRelationsHelper
41 41 helper :watchers
42 42 include WatchersHelper
43 43 helper :attachments
44 44 include AttachmentsHelper
45 45 helper :queries
46 46 include QueriesHelper
47 47 helper :repositories
48 48 include RepositoriesHelper
49 49 helper :sort
50 50 include SortHelper
51 51 include IssuesHelper
52 52 helper :timelog
53 53 helper :gantt
54 54 include Redmine::Export::PDF
55 55
56 56 verify :method => [:post, :delete],
57 57 :only => :destroy,
58 58 :render => { :nothing => true, :status => :method_not_allowed }
59 59
60 60 verify :method => :post, :only => :create, :render => {:nothing => true, :status => :method_not_allowed }
61 61 verify :method => :post, :only => :bulk_update, :render => {:nothing => true, :status => :method_not_allowed }
62 62 verify :method => :put, :only => :update, :render => {:nothing => true, :status => :method_not_allowed }
63 63
64 64 def index
65 65 retrieve_query
66 66 sort_init(@query.sort_criteria.empty? ? [['id', 'desc']] : @query.sort_criteria)
67 67 sort_update(@query.sortable_columns)
68 68
69 69 if @query.valid?
70 70 case params[:format]
71 71 when 'csv', 'pdf'
72 72 @limit = Setting.issues_export_limit.to_i
73 73 when 'atom'
74 74 @limit = Setting.feeds_limit.to_i
75 75 when 'xml', 'json'
76 76 @offset, @limit = api_offset_and_limit
77 77 else
78 78 @limit = per_page_option
79 79 end
80 80
81 81 @issue_count = @query.issue_count
82 82 @issue_pages = Paginator.new self, @issue_count, @limit, params['page']
83 83 @offset ||= @issue_pages.current.offset
84 84 @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
85 85 :order => sort_clause,
86 86 :offset => @offset,
87 87 :limit => @limit)
88 88 @issue_count_by_group = @query.issue_count_by_group
89 89
90 90 respond_to do |format|
91 91 format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
92 92 format.api
93 93 format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
94 94 format.csv { send_data(issues_to_csv(@issues, @project), :type => 'text/csv; header=present', :filename => 'export.csv') }
95 95 format.pdf { send_data(issues_to_pdf(@issues, @project, @query), :type => 'application/pdf', :filename => 'export.pdf') }
96 96 end
97 97 else
98 98 # Send html if the query is not valid
99 99 render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
100 100 end
101 101 rescue ActiveRecord::RecordNotFound
102 102 render_404
103 103 end
104 104
105 105 def show
106 106 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
107 107 @journals.each_with_index {|j,i| j.indice = i+1}
108 108 @journals.reverse! if User.current.wants_comments_in_reverse_order?
109 109 @changesets = @issue.changesets.visible.all
110 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 112 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
112 113 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
113 114 @priorities = IssuePriority.all
114 115 @time_entry = TimeEntry.new
115 116 respond_to do |format|
116 117 format.html { render :template => 'issues/show.rhtml' }
117 118 format.api
118 119 format.atom { render :template => 'journals/index', :layout => false, :content_type => 'application/atom+xml' }
119 120 format.pdf { send_data(issue_to_pdf(@issue), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
120 121 end
121 122 end
122 123
123 124 # Add a new issue
124 125 # The new issue will be created from an existing one if copy_from parameter is given
125 126 def new
126 127 respond_to do |format|
127 128 format.html { render :action => 'new', :layout => !request.xhr? }
128 129 format.js { render :partial => 'attributes' }
129 130 end
130 131 end
131 132
132 133 def create
133 134 call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
134 135 if @issue.save
135 136 attachments = Attachment.attach_files(@issue, params[:attachments])
136 137 render_attachment_warning_if_needed(@issue)
137 138 flash[:notice] = l(:notice_successful_create)
138 139 call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
139 140 respond_to do |format|
140 141 format.html {
141 142 redirect_to(params[:continue] ? { :action => 'new', :project_id => @project, :issue => {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} } :
142 143 { :action => 'show', :id => @issue })
143 144 }
144 145 format.api { render :action => 'show', :status => :created, :location => issue_url(@issue) }
145 146 end
146 147 return
147 148 else
148 149 respond_to do |format|
149 150 format.html { render :action => 'new' }
150 151 format.api { render_validation_errors(@issue) }
151 152 end
152 153 end
153 154 end
154 155
155 156 def edit
156 157 update_issue_from_params
157 158
158 159 @journal = @issue.current_journal
159 160
160 161 respond_to do |format|
161 162 format.html { }
162 163 format.xml { }
163 164 end
164 165 end
165 166
166 167 def update
167 168 update_issue_from_params
168 169
169 170 if @issue.save_issue_with_child_records(params, @time_entry)
170 171 render_attachment_warning_if_needed(@issue)
171 172 flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
172 173
173 174 respond_to do |format|
174 175 format.html { redirect_back_or_default({:action => 'show', :id => @issue}) }
175 176 format.api { head :ok }
176 177 end
177 178 else
178 179 render_attachment_warning_if_needed(@issue)
179 180 flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record?
180 181 @journal = @issue.current_journal
181 182
182 183 respond_to do |format|
183 184 format.html { render :action => 'edit' }
184 185 format.api { render_validation_errors(@issue) }
185 186 end
186 187 end
187 188 end
188 189
189 190 # Bulk edit a set of issues
190 191 def bulk_edit
191 192 @issues.sort!
192 193 @available_statuses = @projects.map{|p|Workflow.available_statuses(p)}.inject{|memo,w|memo & w}
193 194 @custom_fields = @projects.map{|p|p.all_issue_custom_fields}.inject{|memo,c|memo & c}
194 195 @assignables = @projects.map(&:assignable_users).inject{|memo,a| memo & a}
195 196 @trackers = @projects.map(&:trackers).inject{|memo,t| memo & t}
196 197 end
197 198
198 199 def bulk_update
199 200 @issues.sort!
200 201 attributes = parse_params_for_bulk_issue_attributes(params)
201 202
202 203 unsaved_issue_ids = []
203 204 @issues.each do |issue|
204 205 issue.reload
205 206 journal = issue.init_journal(User.current, params[:notes])
206 207 issue.safe_attributes = attributes
207 208 call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
208 209 unless issue.save
209 210 # Keep unsaved issue ids to display them in flash error
210 211 unsaved_issue_ids << issue.id
211 212 end
212 213 end
213 214 set_flash_from_bulk_issue_save(@issues, unsaved_issue_ids)
214 215 redirect_back_or_default({:controller => 'issues', :action => 'index', :project_id => @project})
215 216 end
216 217
217 218 def destroy
218 219 @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
219 220 if @hours > 0
220 221 case params[:todo]
221 222 when 'destroy'
222 223 # nothing to do
223 224 when 'nullify'
224 225 TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
225 226 when 'reassign'
226 227 reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
227 228 if reassign_to.nil?
228 229 flash.now[:error] = l(:error_issue_not_found_in_project)
229 230 return
230 231 else
231 232 TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
232 233 end
233 234 else
234 235 # display the destroy form if it's a user request
235 236 return unless api_request?
236 237 end
237 238 end
238 239 @issues.each(&:destroy)
239 240 respond_to do |format|
240 241 format.html { redirect_back_or_default(:action => 'index', :project_id => @project) }
241 242 format.api { head :ok }
242 243 end
243 244 end
244 245
245 246 private
246 247 def find_issue
247 248 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
248 249 @project = @issue.project
249 250 rescue ActiveRecord::RecordNotFound
250 251 render_404
251 252 end
252 253
253 254 def find_project
254 255 project_id = (params[:issue] && params[:issue][:project_id]) || params[:project_id]
255 256 @project = Project.find(project_id)
256 257 rescue ActiveRecord::RecordNotFound
257 258 render_404
258 259 end
259 260
260 261 # Used by #edit and #update to set some common instance variables
261 262 # from the params
262 263 # TODO: Refactor, not everything in here is needed by #edit
263 264 def update_issue_from_params
264 265 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
265 266 @priorities = IssuePriority.all
266 267 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
267 268 @time_entry = TimeEntry.new
268 269 @time_entry.attributes = params[:time_entry]
269 270
270 271 @notes = params[:notes] || (params[:issue].present? ? params[:issue][:notes] : nil)
271 272 @issue.init_journal(User.current, @notes)
272 273 @issue.safe_attributes = params[:issue]
273 274 end
274 275
275 276 # TODO: Refactor, lots of extra code in here
276 277 # TODO: Changing tracker on an existing issue should not trigger this
277 278 def build_new_issue_from_params
278 279 if params[:id].blank?
279 280 @issue = Issue.new
280 281 @issue.copy_from(params[:copy_from]) if params[:copy_from]
281 282 @issue.project = @project
282 283 else
283 284 @issue = @project.issues.visible.find(params[:id])
284 285 end
285 286
286 287 @issue.project = @project
287 288 # Tracker must be set before custom field values
288 289 @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
289 290 if @issue.tracker.nil?
290 291 render_error l(:error_no_tracker_in_project)
291 292 return false
292 293 end
293 294 @issue.start_date ||= Date.today
294 295 if params[:issue].is_a?(Hash)
295 296 @issue.safe_attributes = params[:issue]
296 297 if User.current.allowed_to?(:add_issue_watchers, @project) && @issue.new_record?
297 298 @issue.watcher_user_ids = params[:issue]['watcher_user_ids']
298 299 end
299 300 end
300 301 @issue.author = User.current
301 302 @priorities = IssuePriority.all
302 303 @allowed_statuses = @issue.new_statuses_allowed_to(User.current, true)
303 304 end
304 305
305 306 def check_for_default_issue_status
306 307 if IssueStatus.default.nil?
307 308 render_error l(:error_no_default_issue_status)
308 309 return false
309 310 end
310 311 end
311 312
312 313 def parse_params_for_bulk_issue_attributes(params)
313 314 attributes = (params[:issue] || {}).reject {|k,v| v.blank?}
314 315 attributes.keys.each {|k| attributes[k] = '' if attributes[k] == 'none'}
315 316 attributes[:custom_field_values].reject! {|k,v| v.blank?} if attributes[:custom_field_values]
316 317 attributes
317 318 end
318 319 end
@@ -1,34 +1,34
1 1 <div class="contextual">
2 2 <% if authorize_for('issue_relations', 'new') %>
3 3 <%= toggle_link l(:button_add), 'new-relation-form', {:focus => 'relation_issue_to_id'} %>
4 4 <% end %>
5 5 </div>
6 6
7 7 <p><strong><%=l(:label_related_issues)%></strong></p>
8 8
9 <% if @issue.relations.any? %>
9 <% if @relations.present? %>
10 10 <table style="width:100%">
11 <% @issue.relations.select {|r| r.other_issue(@issue).visible? }.each do |relation| %>
11 <% @relations.each do |relation| %>
12 12 <tr>
13 13 <td><%= l(relation.label_for(@issue)) %> <%= "(#{l('datetime.distance_in_words.x_days', :count => relation.delay)})" if relation.delay && relation.delay != 0 %>
14 14 <%= h(relation.other_issue(@issue).project) + ' - ' if Setting.cross_project_issue_relations? %>
15 15 <%= link_to_issue(relation.other_issue(@issue), :truncate => 60) %>
16 16 </td>
17 17 <td><%= relation.other_issue(@issue).status.name %></td>
18 18 <td><%= format_date(relation.other_issue(@issue).start_date) %></td>
19 19 <td><%= format_date(relation.other_issue(@issue).due_date) %></td>
20 20 <td><%= link_to_remote(image_tag('delete.png'), { :url => {:controller => 'issue_relations', :action => 'destroy', :issue_id => @issue, :id => relation},
21 21 :method => :post
22 22 }, :title => l(:label_relation_delete)) if authorize_for('issue_relations', 'destroy') %></td>
23 23 </tr>
24 24 <% end %>
25 25 </table>
26 26 <% end %>
27 27
28 28 <% remote_form_for(:relation, @relation,
29 29 :url => {:controller => 'issue_relations', :action => 'new', :issue_id => @issue},
30 30 :method => :post,
31 31 :complete => "Form.Element.focus('relation_issue_to_id');",
32 32 :html => {:id => 'new-relation-form', :style => (@relation ? '' : 'display: none;')}) do |f| %>
33 33 <%= render :partial => 'issue_relations/form', :locals => {:f => f}%>
34 34 <% end %>
@@ -1,61 +1,61
1 1 api.issue do
2 2 api.id @issue.id
3 3 api.project(:id => @issue.project_id, :name => @issue.project.name) unless @issue.project.nil?
4 4 api.tracker(:id => @issue.tracker_id, :name => @issue.tracker.name) unless @issue.tracker.nil?
5 5 api.status(:id => @issue.status_id, :name => @issue.status.name) unless @issue.status.nil?
6 6 api.priority(:id => @issue.priority_id, :name => @issue.priority.name) unless @issue.priority.nil?
7 7 api.author(:id => @issue.author_id, :name => @issue.author.name) unless @issue.author.nil?
8 8 api.assigned_to(:id => @issue.assigned_to_id, :name => @issue.assigned_to.name) unless @issue.assigned_to.nil?
9 9 api.category(:id => @issue.category_id, :name => @issue.category.name) unless @issue.category.nil?
10 10 api.fixed_version(:id => @issue.fixed_version_id, :name => @issue.fixed_version.name) unless @issue.fixed_version.nil?
11 11 api.parent(:id => @issue.parent_id) unless @issue.parent.nil?
12 12
13 13 api.subject @issue.subject
14 14 api.description @issue.description
15 15 api.start_date @issue.start_date
16 16 api.due_date @issue.due_date
17 17 api.done_ratio @issue.done_ratio
18 18 api.estimated_hours @issue.estimated_hours
19 19 api.spent_hours(@issue.spent_hours) if User.current.allowed_to?(:view_time_entries, @project)
20 20
21 21 render_api_custom_values @issue.custom_field_values, api
22 22
23 23 api.created_on @issue.created_on
24 24 api.updated_on @issue.updated_on
25 25
26 26 render_api_issue_children(@issue, api) if include_in_api_response?('children')
27 27
28 28 api.array :relations do
29 @issue.relations.select {|r| r.other_issue(@issue).visible? }.each do |relation|
29 @relations.each do |relation|
30 30 api.relation(:id => relation.id, :issue_id => relation.other_issue(@issue).id, :relation_type => relation.relation_type_for(@issue), :delay => relation.delay)
31 31 end
32 end if include_in_api_response?('relations')
32 end if include_in_api_response?('relations') && @relations.present?
33 33
34 34 api.array :changesets do
35 35 @issue.changesets.each do |changeset|
36 36 api.changeset :revision => changeset.revision do
37 37 api.user(:id => changeset.user_id, :name => changeset.user.name) unless changeset.user.nil?
38 38 api.comments changeset.comments
39 39 api.committed_on changeset.committed_on
40 40 end
41 41 end
42 42 end if include_in_api_response?('changesets') && User.current.allowed_to?(:view_changesets, @project)
43 43
44 44 api.array :journals do
45 45 @issue.journals.each do |journal|
46 46 api.journal :id => journal.id do
47 47 api.user(:id => journal.user_id, :name => journal.user.name) unless journal.user.nil?
48 48 api.notes journal.notes
49 49 api.created_on journal.created_on
50 50 api.array :details do
51 51 journal.details.each do |detail|
52 52 api.detail :property => detail.property, :name => detail.prop_key do
53 53 api.old_value detail.old_value
54 54 api.new_value detail.value
55 55 end
56 56 end
57 57 end
58 58 end
59 59 end
60 60 end if include_in_api_response?('journals')
61 61 end
General Comments 0
You need to be logged in to leave comments. Login now