From ca9e175bb723fc4794db1d195d17b54589422e5c Mon Sep 17 00:00:00 2001 From: Kat Date: Wed, 17 Jan 2024 09:37:52 +0000 Subject: [PATCH] Disable collection year validations on review apps --- app/models/validations/setup_validations.rb | 2 +- app/services/feature_toggle.rb | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/models/validations/setup_validations.rb b/app/models/validations/setup_validations.rb index adfcfe861..79a5d5c7a 100644 --- a/app/models/validations/setup_validations.rb +++ b/app/models/validations/setup_validations.rb @@ -3,7 +3,7 @@ module Validations::SetupValidations include CollectionTimeHelper def validate_startdate_setup(record) - return unless record.startdate && date_valid?("startdate", record) + return unless record.startdate && date_valid?("startdate", record) && FeatureToggle.startdate_collection_window_validation_enabled? first_collection_start_date = if record.startdate_was.present? editable_collection_start_date diff --git a/app/services/feature_toggle.rb b/app/services/feature_toggle.rb index 563bade3a..38c1372e1 100644 --- a/app/services/feature_toggle.rb +++ b/app/services/feature_toggle.rb @@ -1,7 +1,11 @@ class FeatureToggle # Disable check on preview apps to allow for testing of future forms def self.saledate_collection_window_validation_enabled? - true + Rails.env.production? || Rails.env.test? || Rails.env.staging? + end + + def self.startdate_collection_window_validation_enabled? + Rails.env.production? || Rails.env.test? || Rails.env.staging? end def self.startdate_two_week_validation_enabled? @@ -9,7 +13,7 @@ class FeatureToggle end def self.saledate_two_week_validation_enabled? - Rails.env.production? || Rails.env.test? || Rails.env.staging? || Rails.env.review? + Rails.env.production? || Rails.env.test? || Rails.env.staging? end def self.bulk_upload_duplicate_log_check_enabled?