Commit 6c74d0e7d4b42258462cb6cb49904cbceb7c4a51

Fixes for the filter

Commit diff

app/controllers/tickets_controller.rb

 
88 @tickets = Ticket.filtered(filter)
99 @current_milestone = Milestone.find_current_milestone(@project.id)
1010 #
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
1212 @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
1414 @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
1616 @filter_submitters = Member.find_by_project_alpha(@project.id)
1717 #
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 />
2118 render :action => "ac_project_index"
2219 end
2320
toggle raw diff

app/models/ticket.rb

 
9090 w << "AND tickets.priority IN (#{priority})\n" if priority
9191 #w << "AND tickets.audience IN (#{audience})\n"
9292
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
9696
9797 find_by_sql("SELECT tickets.slug,
9898 tickets.summary,
toggle raw diff