diff --git a/app/javascript/styles/_application-custom.scss b/app/javascript/styles/_application-custom.scss index 72ebd5500..26ef1383f 100644 --- a/app/javascript/styles/_application-custom.scss +++ b/app/javascript/styles/_application-custom.scss @@ -1,19 +1,4 @@ -.a, -.govuk-link { - color: #1d70b8; - &__link:link { - color: #003078; - } - &__visited { - color: #4c2c92; - } - &__link:focus { - color: #0b0c0c; - } - &__link:hover { - color: #003078; - } -} +$govuk-global-styles: true; // turbo-frame { // display: block; diff --git a/app/models/case_log.rb b/app/models/case_log.rb index 1842dc55a..5553b5a78 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -10,7 +10,7 @@ class CaseLogValidator < ActiveModel::Validator # If we've come from the form UI we only want to validate the specific fields # that have just been submitted. If we're submitting a log via API or Bulk Upload # we want to validate all data fields. - page_to_validate = options[:page] + page_to_validate = record.page if page_to_validate public_send("validate_#{page_to_validate}", record) if respond_to?("validate_#{page_to_validate}") else @@ -41,7 +41,7 @@ class CaseLog < ApplicationRecord default_scope -> { kept } scope :not_completed, -> { where.not(status: "completed") } - validates_with CaseLogValidator, ({ page: @page } || {}) + validates_with CaseLogValidator before_save :update_status! attr_accessor :page