From fa60b229dcd5f49bcdb39bdbdb55416cc72581da Mon Sep 17 00:00:00 2001 From: Aparna Karve Date: Thu, 7 Jun 2018 14:18:11 -0700 Subject: [PATCH] fixed the virtual columns to be able to use in api with filter[] --- app/models/mixins/archived_mixin.rb | 2 ++ app/models/service_template.rb | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/models/mixins/archived_mixin.rb b/app/models/mixins/archived_mixin.rb index 1f4643a271a..20352137b19 100644 --- 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 index 40e4b767de9..26134ba00ce 100644 --- 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' }