metadata_presenter 2.19.1 → 2.19.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/metadata_presenter/save_and_return_controller.rb +13 -5
- data/app/controllers/metadata_presenter/submissions_controller.rb +5 -0
- data/app/views/metadata_presenter/page/checkanswers.html.erb +2 -2
- data/app/views/metadata_presenter/save_and_return/save_progress.html.erb +1 -3
- data/lib/metadata_presenter/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2279ffc71300e31a078526283d51dd9264d7b6dc8912e714758ea099a0f4b261
|
|
4
|
+
data.tar.gz: d1288a6835ee16441c6d267d9ac97c23178b63474b9b5b26100fd2bb93ab6836
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0ed0cc7cb93eb72ce9708daf8dbde6f4a39d40a1bc94bf55900f807debe21c78d7674e89b2385301771bbaf9a7a31a3721345f3f893a53b118cffc0918913ac9
|
|
7
|
+
data.tar.gz: b6e2ec8a129bd962d64dc8b28811a9792d2f8458eb042cca80513647288102c7ec8050dfce3c694328273f658ccbb7a98d2b33ffb2085c7b2b72cac9be29fbd1
|
|
@@ -7,23 +7,31 @@ module MetadataPresenter
|
|
|
7
7
|
end
|
|
8
8
|
|
|
9
9
|
def page_slug
|
|
10
|
+
if params && params[:page_slug].present?
|
|
11
|
+
return params[:page_slug]
|
|
12
|
+
end
|
|
10
13
|
if session['returning_slug'].present?
|
|
11
14
|
return session['returning_slug']
|
|
12
15
|
end
|
|
13
16
|
if session['saved_form'].present?
|
|
14
17
|
return session['saved_form']['page_slug']
|
|
15
18
|
end
|
|
19
|
+
|
|
16
20
|
if params['saved_form'].present?
|
|
17
|
-
|
|
21
|
+
params['saved_form']['page_slug']
|
|
18
22
|
end
|
|
19
|
-
|
|
20
|
-
params[:page_slug]
|
|
21
23
|
end
|
|
22
24
|
|
|
23
25
|
def confirmed_email
|
|
24
26
|
email = session['saved_form']['email']
|
|
25
|
-
session[
|
|
26
|
-
|
|
27
|
+
session['saved_form']['email'] = nil
|
|
28
|
+
session['saved_form']['user_id'] = nil
|
|
29
|
+
session['saved_form']['user_token'] = nil
|
|
30
|
+
session['saved_form']['secret_answer'] = nil
|
|
31
|
+
session['saved_form']['secret_question'] = nil
|
|
32
|
+
session['saved_form']['secret_question_text'] = nil
|
|
33
|
+
session['saved_form']['service_slug'] = nil
|
|
34
|
+
session['saved_form']['service_version'] = nil
|
|
27
35
|
email
|
|
28
36
|
end
|
|
29
37
|
|
|
@@ -4,6 +4,11 @@ module MetadataPresenter
|
|
|
4
4
|
@page = service.confirmation_page
|
|
5
5
|
|
|
6
6
|
if @page
|
|
7
|
+
if params[:save_for_later_check_answers].present?
|
|
8
|
+
# this flag is sent by the check answers page, and we don't want to submit & validate here
|
|
9
|
+
redirect_to save_path(page_slug: params[:page_slug]) and return
|
|
10
|
+
end
|
|
11
|
+
|
|
7
12
|
create_submission
|
|
8
13
|
redirect_to_page @page.url
|
|
9
14
|
else
|
|
@@ -89,9 +89,9 @@
|
|
|
89
89
|
<%= t('presenter.actions.submit') -%></button>
|
|
90
90
|
<% if save_and_return_enabled? %>
|
|
91
91
|
<% if editor_preview? || editable? %>
|
|
92
|
-
<%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: '
|
|
92
|
+
<%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later_check_answers', disabled: true %>
|
|
93
93
|
<% else %>
|
|
94
|
-
<%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: '
|
|
94
|
+
<%= button_to t('presenter.save_and_return.save'), '/', params: { page_slug:request.env['PATH_INFO'] }, method: :post, class: "govuk-button govuk-button--secondary", name: 'save_for_later_check_answers'%>
|
|
95
95
|
<% end %>
|
|
96
96
|
<% end %>
|
|
97
97
|
</div>
|
|
@@ -2,11 +2,9 @@
|
|
|
2
2
|
<div class="govuk-grid-row">
|
|
3
3
|
<div class="govuk-grid-column-two-thirds">
|
|
4
4
|
<h1 id="page-heading" class="govuk-heading-xl"><%= t('presenter.save_and_return.saved.heading') %></h1>
|
|
5
|
-
<p class="
|
|
5
|
+
<p class="govuk-body-l"><%= t('presenter.save_and_return.saved.success', email: confirmed_email) %></p>
|
|
6
6
|
<p><%= t('presenter.save_and_return.saved.info_1') %></p>
|
|
7
|
-
<br/>
|
|
8
7
|
<p><%= t('presenter.save_and_return.saved.info_2') %></p>
|
|
9
|
-
<br/>
|
|
10
8
|
<p><%= t('presenter.save_and_return.saved.info_3') %></p>
|
|
11
9
|
</div>
|
|
12
10
|
</div>
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metadata_presenter
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.19.
|
|
4
|
+
version: 2.19.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- MoJ Forms
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2023-05-
|
|
11
|
+
date: 2023-05-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: govuk_design_system_formbuilder
|