Merge pull request #17553 from AparnaKarve/fix_archived_api_attribute

Fixed the virtual columns to be able to use in the API with `filter[]`
ManageIQ · Jun 20, 2018 · 58af1d2 · 58af1d2
2 parents 84e9fa9 + fa60b22
commit 58af1d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/models/mixins/archived_mixin.rb b/app/models/mixins/archived_mixin.rb
@@ -9,10 +9,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
@@ -62,7 +62,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   :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' }