Merge pull request #17553 from AparnaKarve/fix_archived_api_attribute

Fixed the virtual columns to be able to use in the API with `filter[]` (cherry picked from commit 58af1d2) https://bugzilla.redhat.com/show_bug.cgi?id=1594023
ManageIQ · Jun 21, 2018 · 518a0ae · 518a0ae
1 parent 23e26a2
commit 518a0ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/app/models/mixins/archived_mixin.rb b/app/models/mixins/archived_mixin.rb
@@ -11,10 +11,12 @@ module ArchivedMixin
   def archived?
     !active?
   end
+  alias_method :archived, :archived?
 
   def active?
     deleted_on.nil?
   end
+  alias_method :active, :active?
 
   def archive!
     update_attributes!(:deleted_on => Time.now.utc)

diff --git a/app/models/service_template.rb b/app/models/service_template.rb
@@ -68,6 +68,8 @@ class ServiceTemplate < ApplicationRecord
   virtual_column   :type_display,                 :type => :string
   virtual_column   :template_valid,               :type => :boolean
   virtual_column   :template_valid_error_message, :type => :string
+  virtual_column   :archived,                     :type => :boolean
+  virtual_column   :active,                       :type => :boolean
 
   default_value_for :service_type, 'unknown'
   default_value_for(:generic_subtype) { |st| 'custom' if st.prov_type == 'generic' }