Merge pull request theforeman#140 from ohadlevy/excplict-table-name

fixes #11950 scopes now uses full table name in conditions.
MariaAga · Sep 25, 2015 · 8e724da · 8e724da
2 parents 6d949e8 + 6bac54c
commit 8e724da
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/app/models/foreman_tasks/task.rb b/app/models/foreman_tasks/task.rb
@@ -31,14 +31,14 @@ class Task < ActiveRecord::Base
     scoped_search :in => :owners,  :on => :login, :complete_value => true, :rename => "owner.login", :ext_method => :search_by_owner
     scoped_search :in => :owners,  :on => :firstname, :complete_value => true, :rename => "owner.firstname", :ext_method => :search_by_owner
 
-    scope :active, -> {  where('state != ?', :stopped) }
-    scope :running, -> {  where("state NOT IN ('stopped', 'paused')") }
+    scope :active, -> {  where('foreman_tasks_tasks.state != ?', :stopped) }
+    scope :running, -> {  where("foreman_tasks_tasks.state NOT IN ('stopped', 'paused')") }
     scope :for_resource,
         (lambda do |resource|
            joins(:locks).where(:"foreman_tasks_locks.resource_id" => resource.id,
                                :"foreman_tasks_locks.resource_type" => resource.class.name)
          end)
-    scope :for_action_types, (lambda { |action_types| where('label IN (?)', Array(action_types)) })
+    scope :for_action_types, (lambda { |action_types| where('foreman_tasks_tasks.label IN (?)', Array(action_types)) })
 
     def input
       {}