##// END OF EJS Templates
Added two new plugin hooks to IssuesController:...
Eric Davis -
r2259:75c10a1cac41
parent child
Show More
@@ -1,486 +1,488
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
20 20
21 21 before_filter :find_issue, :only => [:show, :edit, :reply]
22 22 before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
23 23 before_filter :find_project, :only => [:new, :update_form, :preview]
24 24 before_filter :authorize, :except => [:index, :changes, :gantt, :calendar, :preview, :update_form, :context_menu]
25 25 before_filter :find_optional_project, :only => [:index, :changes, :gantt, :calendar]
26 26 accept_key_auth :index, :changes
27 27
28 28 helper :journals
29 29 helper :projects
30 30 include ProjectsHelper
31 31 helper :custom_fields
32 32 include CustomFieldsHelper
33 33 helper :issue_relations
34 34 include IssueRelationsHelper
35 35 helper :watchers
36 36 include WatchersHelper
37 37 helper :attachments
38 38 include AttachmentsHelper
39 39 helper :queries
40 40 helper :sort
41 41 include SortHelper
42 42 include IssuesHelper
43 43 helper :timelog
44 44 include Redmine::Export::PDF
45 45
46 46 def index
47 47 retrieve_query
48 48 sort_init 'id', 'desc'
49 49 sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
50 50
51 51 if @query.valid?
52 52 limit = per_page_option
53 53 respond_to do |format|
54 54 format.html { }
55 55 format.atom { }
56 56 format.csv { limit = Setting.issues_export_limit.to_i }
57 57 format.pdf { limit = Setting.issues_export_limit.to_i }
58 58 end
59 59 @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
60 60 @issue_pages = Paginator.new self, @issue_count, limit, params['page']
61 61 @issues = Issue.find :all, :order => sort_clause,
62 62 :include => [ :assigned_to, :status, :tracker, :project, :priority, :category, :fixed_version ],
63 63 :conditions => @query.statement,
64 64 :limit => limit,
65 65 :offset => @issue_pages.current.offset
66 66 respond_to do |format|
67 67 format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
68 68 format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
69 69 format.csv { send_data(issues_to_csv(@issues, @project).read, :type => 'text/csv; header=present', :filename => 'export.csv') }
70 70 format.pdf { send_data(issues_to_pdf(@issues, @project), :type => 'application/pdf', :filename => 'export.pdf') }
71 71 end
72 72 else
73 73 # Send html if the query is not valid
74 74 render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
75 75 end
76 76 rescue ActiveRecord::RecordNotFound
77 77 render_404
78 78 end
79 79
80 80 def changes
81 81 retrieve_query
82 82 sort_init 'id', 'desc'
83 83 sort_update({'id' => "#{Issue.table_name}.id"}.merge(@query.columns.inject({}) {|h, c| h[c.name.to_s] = c.sortable; h}))
84 84
85 85 if @query.valid?
86 86 @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ],
87 87 :conditions => @query.statement,
88 88 :limit => 25,
89 89 :order => "#{Journal.table_name}.created_on DESC"
90 90 end
91 91 @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
92 92 render :layout => false, :content_type => 'application/atom+xml'
93 93 rescue ActiveRecord::RecordNotFound
94 94 render_404
95 95 end
96 96
97 97 def show
98 98 @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
99 99 @journals.each_with_index {|j,i| j.indice = i+1}
100 100 @journals.reverse! if User.current.wants_comments_in_reverse_order?
101 101 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
102 102 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
103 103 @priorities = Enumeration::get_values('IPRI')
104 104 @time_entry = TimeEntry.new
105 105 respond_to do |format|
106 106 format.html { render :template => 'issues/show.rhtml' }
107 107 format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' }
108 108 format.pdf { send_data(issue_to_pdf(@issue), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
109 109 end
110 110 end
111 111
112 112 # Add a new issue
113 113 # The new issue will be created from an existing one if copy_from parameter is given
114 114 def new
115 115 @issue = Issue.new
116 116 @issue.copy_from(params[:copy_from]) if params[:copy_from]
117 117 @issue.project = @project
118 118 # Tracker must be set before custom field values
119 119 @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
120 120 if @issue.tracker.nil?
121 121 flash.now[:error] = 'No tracker is associated to this project. Please check the Project settings.'
122 122 render :nothing => true, :layout => true
123 123 return
124 124 end
125 125 if params[:issue].is_a?(Hash)
126 126 @issue.attributes = params[:issue]
127 127 @issue.watcher_user_ids = params[:issue]['watcher_user_ids'] if User.current.allowed_to?(:add_issue_watchers, @project)
128 128 end
129 129 @issue.author = User.current
130 130
131 131 default_status = IssueStatus.default
132 132 unless default_status
133 133 flash.now[:error] = 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
134 134 render :nothing => true, :layout => true
135 135 return
136 136 end
137 137 @issue.status = default_status
138 138 @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)).uniq
139 139
140 140 if request.get? || request.xhr?
141 141 @issue.start_date ||= Date.today
142 142 else
143 143 requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
144 144 # Check that the user is allowed to apply the requested status
145 145 @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
146 146 if @issue.save
147 147 attach_files(@issue, params[:attachments])
148 148 flash[:notice] = l(:notice_successful_create)
149 149 Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
150 call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
150 151 redirect_to :controller => 'issues', :action => 'show', :id => @issue
151 152 return
152 153 end
153 154 end
154 155 @priorities = Enumeration::get_values('IPRI')
155 156 render :layout => !request.xhr?
156 157 end
157 158
158 159 # Attributes that can be updated on workflow transition (without :edit permission)
159 160 # TODO: make it configurable (at least per role)
160 161 UPDATABLE_ATTRS_ON_TRANSITION = %w(status_id assigned_to_id fixed_version_id done_ratio) unless const_defined?(:UPDATABLE_ATTRS_ON_TRANSITION)
161 162
162 163 def edit
163 164 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
164 165 @priorities = Enumeration::get_values('IPRI')
165 166 @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
166 167 @time_entry = TimeEntry.new
167 168
168 169 @notes = params[:notes]
169 170 journal = @issue.init_journal(User.current, @notes)
170 171 # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
171 172 if (@edit_allowed || !@allowed_statuses.empty?) && params[:issue]
172 173 attrs = params[:issue].dup
173 174 attrs.delete_if {|k,v| !UPDATABLE_ATTRS_ON_TRANSITION.include?(k) } unless @edit_allowed
174 175 attrs.delete(:status_id) unless @allowed_statuses.detect {|s| s.id.to_s == attrs[:status_id].to_s}
175 176 @issue.attributes = attrs
176 177 end
177 178
178 179 if request.post?
179 180 @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
180 181 @time_entry.attributes = params[:time_entry]
181 182 attachments = attach_files(@issue, params[:attachments])
182 183 attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
183 184
184 185 call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal})
185 186
186 187 if (@time_entry.hours.nil? || @time_entry.valid?) && @issue.save
187 188 # Log spend time
188 189 if current_role.allowed_to?(:log_time)
189 190 @time_entry.save
190 191 end
191 192 if !journal.new_record?
192 193 # Only send notification if something was actually changed
193 194 flash[:notice] = l(:notice_successful_update)
194 195 Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
195 196 end
197 call_hook(:controller_issues_edit_after_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal})
196 198 redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
197 199 end
198 200 end
199 201 rescue ActiveRecord::StaleObjectError
200 202 # Optimistic locking exception
201 203 flash.now[:error] = l(:notice_locking_conflict)
202 204 end
203 205
204 206 def reply
205 207 journal = Journal.find(params[:journal_id]) if params[:journal_id]
206 208 if journal
207 209 user = journal.user
208 210 text = journal.notes
209 211 else
210 212 user = @issue.author
211 213 text = @issue.description
212 214 end
213 215 content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
214 216 content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
215 217 render(:update) { |page|
216 218 page.<< "$('notes').value = \"#{content}\";"
217 219 page.show 'update'
218 220 page << "Form.Element.focus('notes');"
219 221 page << "Element.scrollTo('update');"
220 222 page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;"
221 223 }
222 224 end
223 225
224 226 # Bulk edit a set of issues
225 227 def bulk_edit
226 228 if request.post?
227 229 status = params[:status_id].blank? ? nil : IssueStatus.find_by_id(params[:status_id])
228 230 priority = params[:priority_id].blank? ? nil : Enumeration.find_by_id(params[:priority_id])
229 231 assigned_to = (params[:assigned_to_id].blank? || params[:assigned_to_id] == 'none') ? nil : User.find_by_id(params[:assigned_to_id])
230 232 category = (params[:category_id].blank? || params[:category_id] == 'none') ? nil : @project.issue_categories.find_by_id(params[:category_id])
231 233 fixed_version = (params[:fixed_version_id].blank? || params[:fixed_version_id] == 'none') ? nil : @project.versions.find_by_id(params[:fixed_version_id])
232 234
233 235 unsaved_issue_ids = []
234 236 @issues.each do |issue|
235 237 journal = issue.init_journal(User.current, params[:notes])
236 238 issue.priority = priority if priority
237 239 issue.assigned_to = assigned_to if assigned_to || params[:assigned_to_id] == 'none'
238 240 issue.category = category if category || params[:category_id] == 'none'
239 241 issue.fixed_version = fixed_version if fixed_version || params[:fixed_version_id] == 'none'
240 242 issue.start_date = params[:start_date] unless params[:start_date].blank?
241 243 issue.due_date = params[:due_date] unless params[:due_date].blank?
242 244 issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?
243 245 call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
244 246 # Don't save any change to the issue if the user is not authorized to apply the requested status
245 247 if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save
246 248 # Send notification for each issue (if changed)
247 249 Mailer.deliver_issue_edit(journal) if journal.details.any? && Setting.notified_events.include?('issue_updated')
248 250 else
249 251 # Keep unsaved issue ids to display them in flash error
250 252 unsaved_issue_ids << issue.id
251 253 end
252 254 end
253 255 if unsaved_issue_ids.empty?
254 256 flash[:notice] = l(:notice_successful_update) unless @issues.empty?
255 257 else
256 258 flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
257 259 end
258 260 redirect_to(params[:back_to] || {:controller => 'issues', :action => 'index', :project_id => @project})
259 261 return
260 262 end
261 263 # Find potential statuses the user could be allowed to switch issues to
262 264 @available_statuses = Workflow.find(:all, :include => :new_status,
263 265 :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq.sort
264 266 end
265 267
266 268 def move
267 269 @allowed_projects = []
268 270 # find projects to which the user is allowed to move the issue
269 271 if User.current.admin?
270 272 # admin is allowed to move issues to any active (visible) project
271 273 @allowed_projects = Project.find(:all, :conditions => Project.visible_by(User.current), :order => 'name')
272 274 else
273 275 User.current.memberships.each {|m| @allowed_projects << m.project if m.role.allowed_to?(:move_issues)}
274 276 end
275 277 @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
276 278 @target_project ||= @project
277 279 @trackers = @target_project.trackers
278 280 if request.post?
279 281 new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
280 282 unsaved_issue_ids = []
281 283 @issues.each do |issue|
282 284 issue.init_journal(User.current)
283 285 unsaved_issue_ids << issue.id unless issue.move_to(@target_project, new_tracker)
284 286 end
285 287 if unsaved_issue_ids.empty?
286 288 flash[:notice] = l(:notice_successful_update) unless @issues.empty?
287 289 else
288 290 flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
289 291 end
290 292 redirect_to :controller => 'issues', :action => 'index', :project_id => @project
291 293 return
292 294 end
293 295 render :layout => false if request.xhr?
294 296 end
295 297
296 298 def destroy
297 299 @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
298 300 if @hours > 0
299 301 case params[:todo]
300 302 when 'destroy'
301 303 # nothing to do
302 304 when 'nullify'
303 305 TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
304 306 when 'reassign'
305 307 reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
306 308 if reassign_to.nil?
307 309 flash.now[:error] = l(:error_issue_not_found_in_project)
308 310 return
309 311 else
310 312 TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
311 313 end
312 314 else
313 315 # display the destroy form
314 316 return
315 317 end
316 318 end
317 319 @issues.each(&:destroy)
318 320 redirect_to :action => 'index', :project_id => @project
319 321 end
320 322
321 323 def gantt
322 324 @gantt = Redmine::Helpers::Gantt.new(params)
323 325 retrieve_query
324 326 if @query.valid?
325 327 events = []
326 328 # Issues that have start and due dates
327 329 events += Issue.find(:all,
328 330 :order => "start_date, due_date",
329 331 :include => [:tracker, :status, :assigned_to, :priority, :project],
330 332 :conditions => ["(#{@query.statement}) AND (((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
331 333 )
332 334 # Issues that don't have a due date but that are assigned to a version with a date
333 335 events += Issue.find(:all,
334 336 :order => "start_date, effective_date",
335 337 :include => [:tracker, :status, :assigned_to, :priority, :project, :fixed_version],
336 338 :conditions => ["(#{@query.statement}) AND (((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
337 339 )
338 340 # Versions
339 341 events += Version.find(:all, :include => :project,
340 342 :conditions => ["(#{@query.project_statement}) AND effective_date BETWEEN ? AND ?", @gantt.date_from, @gantt.date_to])
341 343
342 344 @gantt.events = events
343 345 end
344 346
345 347 respond_to do |format|
346 348 format.html { render :template => "issues/gantt.rhtml", :layout => !request.xhr? }
347 349 format.png { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{@project.identifier}-gantt.png") } if @gantt.respond_to?('to_image')
348 350 format.pdf { send_data(gantt_to_pdf(@gantt, @project), :type => 'application/pdf', :filename => "#{@project.nil? ? '' : "#{@project.identifier}-" }gantt.pdf") }
349 351 end
350 352 end
351 353
352 354 def calendar
353 355 if params[:year] and params[:year].to_i > 1900
354 356 @year = params[:year].to_i
355 357 if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
356 358 @month = params[:month].to_i
357 359 end
358 360 end
359 361 @year ||= Date.today.year
360 362 @month ||= Date.today.month
361 363
362 364 @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
363 365 retrieve_query
364 366 if @query.valid?
365 367 events = []
366 368 events += Issue.find(:all,
367 369 :include => [:tracker, :status, :assigned_to, :priority, :project],
368 370 :conditions => ["(#{@query.statement}) AND ((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
369 371 )
370 372 events += Version.find(:all, :include => :project,
371 373 :conditions => ["(#{@query.project_statement}) AND effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
372 374
373 375 @calendar.events = events
374 376 end
375 377
376 378 render :layout => false if request.xhr?
377 379 end
378 380
379 381 def context_menu
380 382 @issues = Issue.find_all_by_id(params[:ids], :include => :project)
381 383 if (@issues.size == 1)
382 384 @issue = @issues.first
383 385 @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
384 386 end
385 387 projects = @issues.collect(&:project).compact.uniq
386 388 @project = projects.first if projects.size == 1
387 389
388 390 @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
389 391 :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
390 392 :update => (@project && (User.current.allowed_to?(:edit_issues, @project) || (User.current.allowed_to?(:change_status, @project) && @allowed_statuses && !@allowed_statuses.empty?))),
391 393 :move => (@project && User.current.allowed_to?(:move_issues, @project)),
392 394 :copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
393 395 :delete => (@project && User.current.allowed_to?(:delete_issues, @project))
394 396 }
395 397 if @project
396 398 @assignables = @project.assignable_users
397 399 @assignables << @issue.assigned_to if @issue && @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
398 400 end
399 401
400 402 @priorities = Enumeration.get_values('IPRI').reverse
401 403 @statuses = IssueStatus.find(:all, :order => 'position')
402 404 @back = request.env['HTTP_REFERER']
403 405
404 406 render :layout => false
405 407 end
406 408
407 409 def update_form
408 410 @issue = Issue.new(params[:issue])
409 411 render :action => :new, :layout => false
410 412 end
411 413
412 414 def preview
413 415 @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
414 416 @attachements = @issue.attachments if @issue
415 417 @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
416 418 render :partial => 'common/preview'
417 419 end
418 420
419 421 private
420 422 def find_issue
421 423 @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
422 424 @project = @issue.project
423 425 rescue ActiveRecord::RecordNotFound
424 426 render_404
425 427 end
426 428
427 429 # Filter for bulk operations
428 430 def find_issues
429 431 @issues = Issue.find_all_by_id(params[:id] || params[:ids])
430 432 raise ActiveRecord::RecordNotFound if @issues.empty?
431 433 projects = @issues.collect(&:project).compact.uniq
432 434 if projects.size == 1
433 435 @project = projects.first
434 436 else
435 437 # TODO: let users bulk edit/move/destroy issues from different projects
436 438 render_error 'Can not bulk edit/move/destroy issues from different projects' and return false
437 439 end
438 440 rescue ActiveRecord::RecordNotFound
439 441 render_404
440 442 end
441 443
442 444 def find_project
443 445 @project = Project.find(params[:project_id])
444 446 rescue ActiveRecord::RecordNotFound
445 447 render_404
446 448 end
447 449
448 450 def find_optional_project
449 451 @project = Project.find(params[:project_id]) unless params[:project_id].blank?
450 452 allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
451 453 allowed ? true : deny_access
452 454 rescue ActiveRecord::RecordNotFound
453 455 render_404
454 456 end
455 457
456 458 # Retrieve query from session or build a new query
457 459 def retrieve_query
458 460 if !params[:query_id].blank?
459 461 cond = "project_id IS NULL"
460 462 cond << " OR project_id = #{@project.id}" if @project
461 463 @query = Query.find(params[:query_id], :conditions => cond)
462 464 @query.project = @project
463 465 session[:query] = {:id => @query.id, :project_id => @query.project_id}
464 466 else
465 467 if params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
466 468 # Give it a name, required to be valid
467 469 @query = Query.new(:name => "_")
468 470 @query.project = @project
469 471 if params[:fields] and params[:fields].is_a? Array
470 472 params[:fields].each do |field|
471 473 @query.add_filter(field, params[:operators][field], params[:values][field])
472 474 end
473 475 else
474 476 @query.available_filters.keys.each do |field|
475 477 @query.add_short_filter(field, params[field]) if params[field]
476 478 end
477 479 end
478 480 session[:query] = {:project_id => @query.project_id, :filters => @query.filters}
479 481 else
480 482 @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
481 483 @query ||= Query.new(:name => "_", :project => @project, :filters => session[:query][:filters])
482 484 @query.project = @project
483 485 end
484 486 end
485 487 end
486 488 end
General Comments 0
You need to be logged in to leave comments. Login now