Skip to content

Commit

Permalink
Add variables to hidden user explanation templates
Browse files Browse the repository at this point in the history
Allow templates to be improve the rendering of prominence reasons and/or
explanations using conditionals to check these new variables so we can
render different text for each field.
  • Loading branch information
gbp committed Feb 5, 2024
1 parent be2823f commit 411cb3a
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
21 changes: 17 additions & 4 deletions app/controllers/services_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,34 @@ def other_country_message
end

def hidden_user_explanation
reason = render_to_string(
prominence_reason = render_to_string(
partial: "admin_request/hidden_user_explanation/#{params[:message]}",
formats: [:text]
formats: [:text],
locals: {
prominence_reason: true,
explanation: false
}
)

explanation = render_to_string(
partial: "admin_request/hidden_user_explanation/#{params[:message]}",
formats: [:text],
locals: {
prominence_reason: false,
explanation: true
}
)

render json: {
prominence_reason: reason,
prominence_reason: prominence_reason,
explanation: render_to_string(
template: "admin_request/hidden_user_explanation",
formats: [:text],
layout: false,
locals: {
name_to: @info_request.user_name.html_safe,
info_request: @info_request,
reason: reason,
explanation: explanation,
info_request_url: request_url(@info_request),
site_name: site_name.html_safe
}
Expand Down
2 changes: 1 addition & 1 deletion app/views/admin_request/hidden_user_explanation.text.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
request: info_request.title.html_safe,
url: info_request_url) %>
<%= reason -%>
<%= explanation -%>
<%= _('You will still be able to view it while logged in to the site. ' \
'Please reply to this email if you would like to discuss this decision ' \
Expand Down
2 changes: 2 additions & 0 deletions doc/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Highlighted Features

* Improve rendering of admin hidden request prominence and explanations (Graeme
Porteous)
* Fix duplicated attachment masking jobs (Graeme Porteous)
* Display metadata on admin attachment views (Graeme Porteous)
* Change request URL patterns to be member routes (Alexander Griffen, Graeme
Expand Down

0 comments on commit 411cb3a

Please sign in to comment.