Commit 67e29ed1354602bc3b31614d85f12d6b7e521122
Exists in
staging
and in
4 other branches
Merge branch 'processed_tasks' into production
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
app/models/task.rb
... | ... | @@ -256,7 +256,7 @@ class Task < ActiveRecord::Base |
256 | 256 | scope :canceled, :conditions => { :status => Task::Status::CANCELLED } |
257 | 257 | scope :closed, :conditions => { :status => [Task::Status::CANCELLED, Task::Status::FINISHED] } |
258 | 258 | scope :opened, :conditions => { :status => [Task::Status::ACTIVE, Task::Status::HIDDEN] } |
259 | - scope :of, lambda { |type| conditions = type ? "type LIKE '#{type}'" : "1=1"; {:conditions => [conditions]} } | |
259 | + scope :of, lambda { |type| conditions = type ? "tasks.type LIKE '#{type}'" : "1=1"; {:conditions => [conditions]} } | |
260 | 260 | scope :order_by, lambda { |attribute, ord| {:order => "#{attribute} #{ord}"} } |
261 | 261 | scope :like, lambda { |field, value| where("LOWER(#{field}) LIKE ?", "%#{value.downcase}%") if value} |
262 | 262 | scope :pending_all, lambda { |profile, filter_type, filter_text| | ... | ... |