Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improved ticket search.

Browse source
This commit is contained in:
Martin Edenhofer 2012-11-14 02:38:11 +01:00
parent 4f081d9671
commit df141b153a
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/tickets_controller.rb
View file

@ -478,7 +478,11 @@ class TicketsController < ApplicationController
end
# do query
tickets_all = Ticket.where(conditions).where( '( title LIKE ? OR number LIKE ? )', "%#{query}%", "%#{query}%" ).limit(limit).order(:created_at)
tickets_all = Ticket.where(conditions).
where( '( title LIKE ? OR number LIKE ? OR ticket_articles.body LIKE ? OR ticket_articles.from LIKE ? OR ticket_articles.to LIKE ? OR ticket_articles.subject LIKE ?)', "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%", "%#{query}%" ).
joins(:ticket_articles).
limit(limit).
order(:created_at)
# build result list
tickets = []

2
app/models/ticket.rb
View file

@ -4,7 +4,7 @@ class Ticket < ApplicationModel
before_destroy :destroy_dependencies
belongs_to :group
has_many :articles, :after_add => :cache_update, :after_remove => :cache_update
has_many :ticket_articles, :class_name => 'Ticket::Article', :after_add => :cache_update, :after_remove => :cache_update
belongs_to :organization
belongs_to :ticket_state, :class_name => 'Ticket::State'
belongs_to :ticket_priority, :class_name => 'Ticket::Priority'