Refs #29647 - remove implicit scopes

stejskalleos · May 4, 2020 · e39a522 · e39a522
1 parent 54608e1
commit e39a522
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/models/katello/erratum.rb b/app/models/katello/erratum.rb
@@ -48,7 +48,7 @@ def self.of_type(type)
     scope :security, -> { of_type(Erratum::SECURITY) }
     scope :bugfix, -> { of_type(Erratum::BUGZILLA) }
     scope :enhancement, -> { of_type(Erratum::ENHANCEMENT) }
-    scope :modular, -> { where(:id => Erratum.joins(:packages => :module_stream_errata_packages)) }
+    scope :modular, -> { where(:id => joins(:packages => :module_stream_errata_packages)) }
     scope :non_modular, -> { where.not(:id => modular) }
 
     def self.content_facet_association_class

diff --git a/app/models/katello/product.rb b/app/models/katello/product.rb
@@ -157,7 +157,7 @@ def used_by_another_org?
       self.class.where(["cp_id = ? AND id != ?", cp_id, id]).count > 0
     end
 
-    scope :all_in_org, ->(org) { Product.joins(:provider).where("#{Katello::Provider.table_name}.organization_id = ?", org.id) }
+    scope :all_in_org, ->(org) { joins(:provider).where("#{Katello::Provider.table_name}.organization_id = ?", org.id) }
 
     def assign_unique_label
       self.label = Util::Model.labelize(self.name) if self.label.blank?