Skip to content

0.381.0 #1830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanwoldatwork merged 2 commits into from
Apr 3, 2025
Merged

0.381.0 #1830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
222863c
explicitly render turnstile
ryanwoldatwork Apr 3, 2025
d9f0070
explicitly render turnstile
ryanwoldatwork Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/views/admin/submissions/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,14 @@
<%= h(@submission.referer) %>
</td>
</tr>
<tr>
<td>
Spam prevention mechanism
</td>
<td>
<%= h(@submission.spam_prevention_mechanism) %>
</td>
</tr>
<tr>
<td>
Language
Expand Down
12 changes: 6 additions & 6 deletions app/views/components/forms/_custom.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,13 @@
<% end %>
</div>
<% end %>
<% if form.enable_turnstile? %>
<div class="margin-top-2">
<div class="cf-turnstile" data-sitekey="<%= ENV.fetch("TURNSTILE_SITE_KEY", nil) %>"></div>
<%= hidden_field_tag "cf-turnstile-response", nil %>
</div>
<% end %>
<%- if section == form.form_sections.last && !form.suppress_submit_button %>
<%- if form.enable_turnstile? %>
<div class="margin-top-2">
<div id="turnstile-container"></div>
<%= hidden_field_tag "cf-turnstile-response", nil %>
</div>
<% end %>
<button type="submit" class="usa-button submit_form_button"><%= t 'form.submit' %></button>
<% end %>
</div>
Expand Down
14 changes: 13 additions & 1 deletion app/views/components/widget/_fba.js.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,19 @@ function FBAform(d, N) {
script.src = "https://challenges.cloudflare.com/turnstile/v0/api.js";
script.async = true;
script.defer = true;
document.head.appendChild(script);
script.onload = this.initTurnstile
if (!window.turnstile) {
document.head.appendChild(script);
}
},
initTurnstile: function() {
turnstile.remove("#turnstile-container");
turnstile.render("#turnstile-container", {
sitekey: "<%= ENV['TURNSTILE_SITE_KEY'] %>",
callback: function (token) {
document.querySelector("input[name='cf-turnstile-response']").value = token;
}
});
},
<% end %>
enableLocalStorage: function() {
Expand Down