Don't reopen AR::Base, include the module in ApplicationRecord

ManageIQ · Feb 27, 2024 · e698c96 · e698c96
1 parent bd8ebfa
commit e698c96
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
@@ -6,6 +6,7 @@ class ApplicationRecord < ActiveRecord::Base
   FIXTURE_DIR = Rails.root.join("db/fixtures")
 
   include ActiveRecord::IdRegions
+  include ActsAsTaggable
   include ArRegion
   include ArLock
   include ArNestedCountBy

diff --git a/lib/extensions/ar_taggable.rb b/lib/extensions/ar_taggable.rb
@@ -1,13 +1,3 @@
-module ActiveRecord
-  class Base
-    def self.acts_as_miq_taggable
-      has_many :taggings, :as => :taggable, :dependent => :destroy
-      has_many :tags, :through => :taggings
-      include ActsAsTaggable
-    end
-  end
-end
-
 module ActsAsTaggable
   extend ActiveSupport::Concern
 
@@ -30,6 +20,11 @@ def writable_classification_tags
   end
 
   module ClassMethods
+    def acts_as_miq_taggable
+      has_many :taggings, :as => :taggable, :dependent => :destroy
+      has_many :tags, :through => :taggings
+    end
+
     # @option options :cat [String|nil] optional category for the tags
     # @option options :ns  [String|nil] optional namespace for the tags