| |   |
| 8 | 8 | @tickets = Ticket.filtered(filter) |
| 9 | 9 | @current_milestone = Milestone.find_current_milestone(@project.id) |
| 10 | 10 | # |
| 11 | | filter[:milestone_id].length > 0 ? @selected_milestone = filter[:milestone_id] : @selected_milestone = nil |
| 11 | filter[:milestone_id] && filter[:milestone_id].length > 0 ? @selected_milestone = filter[:milestone_id] : @selected_milestone = nil |
| 12 | 12 | @filter_milestones = Milestone.find_by_project_active(@project.id, current_user) |
| 13 | | filter[:assignee_id].length > 0 ? @selected_assignee = filter[:assignee_id] : @selected_assignee = nil |
| 13 | filter[:assignee_id] && filter[:assignee_id].length > 0 ? @selected_assignee = filter[:assignee_id] : @selected_assignee = nil |
| 14 | 14 | @filter_assignees = Member.find_by_project_alpha(@project.id) |
| 15 | | filter[:submitter_id].length > 0 ? @selected_submitter = filter[:submitter_id] : @selected_submitter = nil |
| 15 | filter[:submitter_id] && filter[:submitter_id].length > 0 ? @selected_submitter = filter[:submitter_id] : @selected_submitter = nil |
| 16 | 16 | @filter_submitters = Member.find_by_project_alpha(@project.id) |
| 17 | 17 | # |
| 18 | | flash[:notice] = "p:" + filter[:milestone_id] + " f:" + @selected_milestone.to_s |
| 19 | | #flash[:notice] = params[:ticketfilter] |
| 20 | | #<%= select('ticketfilter', 'xmilestone_id', Milestone.find_by_project_active(@project.id, current_user).collect {|c| [c.name, c.id]}, { :prompt => "All", :selected => @filtered_milestone } ) -%><br /> |
| 21 | 18 | render :action => "ac_project_index" |
| 22 | 19 | end |
| 23 | 20 | |
| toggle raw diff |
--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@@ -8,16 +8,13 @@ class TicketsController < ApplicationController
@tickets = Ticket.filtered(filter)
@current_milestone = Milestone.find_current_milestone(@project.id)
#
- filter[:milestone_id].length > 0 ? @selected_milestone = filter[:milestone_id] : @selected_milestone = nil
+ filter[:milestone_id] && filter[:milestone_id].length > 0 ? @selected_milestone = filter[:milestone_id] : @selected_milestone = nil
@filter_milestones = Milestone.find_by_project_active(@project.id, current_user)
- filter[:assignee_id].length > 0 ? @selected_assignee = filter[:assignee_id] : @selected_assignee = nil
+ filter[:assignee_id] && filter[:assignee_id].length > 0 ? @selected_assignee = filter[:assignee_id] : @selected_assignee = nil
@filter_assignees = Member.find_by_project_alpha(@project.id)
- filter[:submitter_id].length > 0 ? @selected_submitter = filter[:submitter_id] : @selected_submitter = nil
+ filter[:submitter_id] && filter[:submitter_id].length > 0 ? @selected_submitter = filter[:submitter_id] : @selected_submitter = nil
@filter_submitters = Member.find_by_project_alpha(@project.id)
#
- flash[:notice] = "p:" + filter[:milestone_id] + " f:" + @selected_milestone.to_s
- #flash[:notice] = params[:ticketfilter]
- #<%= select('ticketfilter', 'xmilestone_id', Milestone.find_by_project_active(@project.id, current_user).collect {|c| [c.name, c.id]}, { :prompt => "All", :selected => @filtered_milestone } ) -%><br />
render :action => "ac_project_index"
end
|
| |   |
| 90 | 90 | w << "AND tickets.priority IN (#{priority})\n" if priority |
| 91 | 91 | #w << "AND tickets.audience IN (#{audience})\n" |
| 92 | 92 | |
| 93 | | w << "AND milestones.id = #{filters[:milestone_id]}\n" if filters[:milestone_id].length > 0 |
| 94 | | w << "AND assignee_id = #{filters[:assignee_id]}\n" if filters[:assignee_id].length > 0 |
| 95 | | w << "AND submitter_id = #{filters[:submitter_id]}\n" if filters[:submitter_id].length > 0 |
| 93 | w << "AND milestones.id = #{filters[:milestone_id]}\n" if filters[:milestone_id] && filters[:milestone_id].length > 0 |
| 94 | w << "AND assignee_id = #{filters[:assignee_id]}\n" if filters[:assignee_id] && filters[:assignee_id].length > 0 |
| 95 | w << "AND submitter_id = #{filters[:submitter_id]}\n" if filters[:submitter_id] && filters[:submitter_id].length > 0 |
| 96 | 96 | |
| 97 | 97 | find_by_sql("SELECT tickets.slug, |
| 98 | 98 | tickets.summary, |
| toggle raw diff |
--- a/app/models/ticket.rb
+++ b/app/models/ticket.rb
@@ -90,9 +90,9 @@ class Ticket < ActiveRecord::Base
w << "AND tickets.priority IN (#{priority})\n" if priority
#w << "AND tickets.audience IN (#{audience})\n"
- w << "AND milestones.id = #{filters[:milestone_id]}\n" if filters[:milestone_id].length > 0
- w << "AND assignee_id = #{filters[:assignee_id]}\n" if filters[:assignee_id].length > 0
- w << "AND submitter_id = #{filters[:submitter_id]}\n" if filters[:submitter_id].length > 0
+ w << "AND milestones.id = #{filters[:milestone_id]}\n" if filters[:milestone_id] && filters[:milestone_id].length > 0
+ w << "AND assignee_id = #{filters[:assignee_id]}\n" if filters[:assignee_id] && filters[:assignee_id].length > 0
+ w << "AND submitter_id = #{filters[:submitter_id]}\n" if filters[:submitter_id] && filters[:submitter_id].length > 0
find_by_sql("SELECT tickets.slug,
tickets.summary, |