From a4d114cff81d2c9a7d23b078f7c93e4afc7048d9 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Mon, 5 Dec 2022 16:25:58 +0000 Subject: [PATCH] refactor: use presence validation for la --- app/models/location.rb | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/models/location.rb b/app/models/location.rb index b97e8f7fa..26413d4d0 100644 --- a/app/models/location.rb +++ b/app/models/location.rb @@ -1,7 +1,7 @@ class Location < ApplicationRecord validates :postcode, on: :postcode, presence: { message: I18n.t("validations.location.postcode_blank") } validate :validate_postcode, on: :postcode - validate :validate_location_admin_district, on: :location_admin_district + validates :location_admin_district, on: :location_admin_district, presence: { message: I18n.t("validations.location_admin_district") } validates :name, on: :name, presence: { message: I18n.t("validations.location.name") } validates :units, on: :units, presence: { message: I18n.t("validations.location.units") } validates :type_of_unit, on: :type_of_unit, presence: { message: I18n.t("validations.location.type_of_unit") } @@ -421,13 +421,6 @@ class Location < ApplicationRecord end end - def validate_location_admin_district - if location_admin_district == "Select an option" - error_message = I18n.t("validations.location_admin_district") - errors.add :location_admin_district, error_message - end - end - def validate_startdate unless startdate.between?(Time.zone.local(1900, 1, 1), Time.zone.local(2200, 1, 1)) error_message = I18n.t("validations.location.startdate_out_of_range")