metadata_presenter 3.0.3 → 3.0.5
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: da2f58ccff1413924ea9fcfe4282447f53de4460a7478319adc32e292502d185
|
|
4
|
+
data.tar.gz: 0b51818f79aad4fde745e23e64ff0ef4a1cc2ce08141a00430615831d9c42fd4
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f767903eb6af9b8c527f6d9f5422bf8245af8840a92089b604b9a331bd468dc8a2ce208e1b86eef078948d8cd6ffca113e6efb508417c6d25c18bf8c9dfe8356
|
|
7
|
+
data.tar.gz: c0c53ab2be8c02d6be56591b64feb004dd4006c5449082b28a86eec5d80b596efe4793ffe9b41a926f6273fad506fe2cb997e10cacf651bc5008fe4ad0c16db3
|
|
@@ -43,10 +43,10 @@ module MetadataPresenter
|
|
|
43
43
|
return {} unless file_details
|
|
44
44
|
|
|
45
45
|
if file_details.is_a?(Hash) || file_details.is_a?(ActionController::Parameters)
|
|
46
|
-
file_details.merge('original_filename' => sanitize(filename(file_details['original_filename'])))
|
|
46
|
+
file_details.merge('original_filename' => sanitize(filename(update_filename(file_details['original_filename']))))
|
|
47
47
|
else
|
|
48
48
|
{
|
|
49
|
-
'original_filename' => sanitize(filename(file_details.original_filename)),
|
|
49
|
+
'original_filename' => sanitize(filename(update_filename(file_details.original_filename))),
|
|
50
50
|
'content_type' => file_details.content_type,
|
|
51
51
|
'tempfile' => file_details.tempfile.path.to_s
|
|
52
52
|
}
|
|
@@ -85,5 +85,16 @@ module MetadataPresenter
|
|
|
85
85
|
|
|
86
86
|
filename
|
|
87
87
|
end
|
|
88
|
+
|
|
89
|
+
def update_filename(answer)
|
|
90
|
+
jfif_or_jpg_extension?(answer) ? "#{File.basename(answer, '.*')}.jpeg" : answer
|
|
91
|
+
end
|
|
92
|
+
|
|
93
|
+
def jfif_or_jpg_extension?(answer)
|
|
94
|
+
return false if answer.nil?
|
|
95
|
+
|
|
96
|
+
file_extension = File.extname(answer)
|
|
97
|
+
%w[.jfif .jpg].include?(file_extension)
|
|
98
|
+
end
|
|
88
99
|
end
|
|
89
100
|
end
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
legend: { text: t('presenter.save_and_return.show.secret_question') },
|
|
28
28
|
hint: {
|
|
29
29
|
data: { "fb-default-text" => default_text('hint') },
|
|
30
|
-
text: t('presenter.save_and_return.show.secret_question_hint')
|
|
30
|
+
text: t('presenter.save_and_return.show.secret_question_hint')
|
|
31
31
|
},
|
|
32
32
|
bold_labels: false
|
|
33
33
|
%>
|
|
@@ -37,9 +37,10 @@
|
|
|
37
37
|
name: "secret_answer"
|
|
38
38
|
%>
|
|
39
39
|
</div>
|
|
40
|
-
|
|
40
|
+
|
|
41
41
|
<div class="govuk-button-group">
|
|
42
|
-
<%= f.govuk_submit t('presenter.save_and_return.show.continue') %>
|
|
42
|
+
<%= f.govuk_submit t('presenter.save_and_return.show.continue') %>
|
|
43
|
+
<%= sanitize(link_to t('presenter.save_and_return.show.cancel'), page_slug, class: "govuk-button govuk-button--secondary" )%>
|
|
43
44
|
</div>
|
|
44
45
|
<% end %>
|
|
45
46
|
</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: 3.0.
|
|
4
|
+
version: 3.0.5
|
|
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-06-
|
|
11
|
+
date: 2023-06-21 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: govuk_design_system_formbuilder
|