metadata_presenter 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a31f247a10c6d27dbc9aa98fcaeba77debba7299bdc07ae0a464d5ef2e0acb4
-  data.tar.gz: 03b6fdf906a24439d474498e86d4c7e0e7978137551cbd7929fd61c06616a3d8
+  metadata.gz: de4803f047828b34c584bbe1a6e3634e55ab62fb7dc5cf84af0e74179fab2bfd
+  data.tar.gz: 48d367b837b22dae94e57158a1f23471ac5c8f51bac70ece003bcaa528eed909
 SHA512:
-  metadata.gz: fc2bc804e2e918de103b68dd0af02a6538f785f49bb4267a74cad8b88f3ed8f6d9d83476df0d2f247bbad44c8121fcbb4941397df1a5189a40e4348bf433b966
-  data.tar.gz: 559b1ddc0c79e391a0406dd7bba3cfc28758aa64fc7c20cc190790c141a9cb025400c83442cc95886509ca75741bf29a0b7121c79edf315d7cf9138a971ec034
+  metadata.gz: 45740afe9df6c30057f70e6c8c8cd24f913c90f6bb63c49a04c4104abbf65c3a87333f648cb8ff55be537ff754a5cb1e86745dd9762acb2df2201ba03bfeebda
+  data.tar.gz: dd590ea13e20ce649630a7640e5877d56dca8081e2b8c118c22da9e4f43e62afaa39b3ddbdf185cc1e6b4f244aaafb9b37b1ca4d6995f8bd90a3deb5b95d8a60

data/app/controllers/metadata_presenter/save_and_return_controller.rb

@@ -42,6 +42,7 @@ module MetadataPresenter
       @saved_form.secret_question = params['saved_form']['secret_question']
       @saved_form.populate_service_values(service)
       @saved_form.populate_session_values(session)
+      @saved_form.service_slug = service_slug
       if @saved_form.valid?
         # put in session until we have confirmed email address
         @saved_form.secret_question = @saved_form.secret_question_text
@@ -231,5 +232,11 @@ module MetadataPresenter
     def label_text(text)
       "<h2 class='govuk-heading-m'>#{text}</h2>"
     end
+
+    private
+
+    def service_slug
+      @service_slug ||= service_slug_config
+    end
   end
 end

data/app/models/metadata_presenter/saved_form.rb

@@ -21,7 +21,7 @@ module MetadataPresenter
                   :created_at,
                   :updated_at
 
-    validates :secret_question, :secret_answer, :service_slug, :page_slug, :service_version, :user_id, :user_token, presence: { message: 'Enter an answer for "%{attribute}"' }, allow_blank: false
+    validates :secret_question, :secret_answer, :page_slug, :service_version, :user_id, :user_token, presence: { message: 'Enter an answer for "%{attribute}"' }, allow_blank: false
 
     def initialize; end
 
@@ -38,7 +38,6 @@ module MetadataPresenter
     end
 
     def populate_service_values(service)
-      self.service_slug    = service.service_slug
       self.service_version = service.version_id
     end
 

data/app/models/metadata_presenter/service.rb

@@ -38,8 +38,6 @@ class MetadataPresenter::Service < MetadataPresenter::Metadata
   end
 
   def service_slug
-    return service_slug_config if service_slug_config.present?
-
     service_name.gsub(/['’]/, '').parameterize
   end
 

data/lib/metadata_presenter/version.rb

@@ -1,3 +1,3 @@
 module MetadataPresenter
-  VERSION = '3.0.1'.freeze
+  VERSION = '3.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metadata_presenter
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - MoJ Forms
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-25 00:00:00.000000000 Z
+date: 2023-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_design_system_formbuilder