Skip to content

AO3-7263 Error 500 when accessing user preferences as an admin for a user that has locale preferences enabled #5544

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
Bilka2 merged 7 commits into from
Feb 10, 2026
Merged

AO3-7263 Error 500 when accessing user preferences as an admin for a user that has locale preferences enabled #5544

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
80b4e2d
Fix locale help modal title in preferences view to use user preferenc…
not-varram Jan 14, 2026
c39803e
add tests & Incorporate comments
not-varram Jan 19, 2026
d9ca1fa
fix syntax errors
not-varram Jan 19, 2026
a87add5
small fix
not-varram Jan 19, 2026
f87d31b
Merge branch 'otwcode:master' into AO3-7263-admin-permission-mismatch
not-varram Jan 27, 2026
2279509
Remove redundant prefs specs
not-varram Feb 3, 2026
4b3ff6f
remove extra line (rubocop)
not-varram Feb 3, 2026
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
2 changes: 1 addition & 1 deletion app/views/preferences/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<dt><%= f.label :time_zone, t(".your_time_zone") %></dt>
<dd><%= f.time_zone_select :time_zone, nil, default: Time.zone.name %></dd>
<% if $rollout.active?(:set_locale_preference, @user) %>
<dt><%= f.label :preferred_locale, t(".your_locale") %> <%= link_to_help_modal(help_preferences_locale_path, t(".locale_help_title", locale: current_user.preference.locale_for_mails)) %></dt>
<dt><%= f.label :preferred_locale, t(".your_locale") %> <%= link_to_help_modal(help_preferences_locale_path, t(".locale_help_title", locale: @preference.locale_for_mails)) %></dt>
Comment thread
not-varram marked this conversation as resolved.
Outdated
<dd><%= f.select :preferred_locale, locale_options_for_select(@available_locales, "id"),
default: @preference.preferred_locale %></dd>
<% end %>
Expand Down
Loading