cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Store selected map color scheme

Browse source
This commit is contained in:
Anton Khorev 2024-12-01 04:18:56 +03:00
parent 444a691578
commit 9f34143049
2 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/preferences_controller.rb
View file

@ -29,6 +29,11 @@ class PreferencesController < ApplicationController
success &= site_color_scheme_preference.update(:v => params[:site_color_scheme]) success &= site_color_scheme_preference.update(:v => params[:site_color_scheme])
end end
if params[:map_color_scheme]
map_color_scheme_preference = current_user.preferences.find_or_create_by(:k => "map.color_scheme")
success &= map_color_scheme_preference.update(:v => params[:map_color_scheme])
end
if success if success
# Use a partial so that it is rendered during the next page load in the correct language. # Use a partial so that it is rendered during the next page load in the correct language.
flash[:notice] = { :partial => "preferences/update_success_flash" } flash[:notice] = { :partial => "preferences/update_success_flash" }

26
test/controllers/preferences_controller_test.rb
View file

@ -23,6 +23,7 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest
def test_update_preferred_editor def test_update_preferred_editor
user = create(:user, :languages => []) user = create(:user, :languages => [])
user.preferences.create(:k => "site.color_scheme", :v => "light") user.preferences.create(:k => "site.color_scheme", :v => "light")
user.preferences.create(:k => "map.color_scheme", :v => "light")
session_for(user) session_for(user)
# Changing to a invalid editor should fail # Changing to a invalid editor should fail
@ -34,6 +35,7 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest
assert_select ".alert-danger", true assert_select ".alert-danger", true
assert_select "form > div > select#user_preferred_editor > option[selected]", false assert_select "form > div > select#user_preferred_editor > option[selected]", false
assert_equal "light", user.preferences.find_by(:k => "site.color_scheme")&.v assert_equal "light", user.preferences.find_by(:k => "site.color_scheme")&.v
assert_equal "light", user.preferences.find_by(:k => "map.color_scheme")&.v
# Changing to a valid editor should work # Changing to a valid editor should work
user.preferred_editor = "id" user.preferred_editor = "id"
@ -44,6 +46,7 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest
assert_select ".alert-success", /^Preferences updated/ assert_select ".alert-success", /^Preferences updated/
assert_select "dd", "iD (in-browser editor)" assert_select "dd", "iD (in-browser editor)"
assert_equal "light", user.preferences.find_by(:k => "site.color_scheme")&.v assert_equal "light", user.preferences.find_by(:k => "site.color_scheme")&.v
assert_equal "light", user.preferences.find_by(:k => "map.color_scheme")&.v
# Changing to the default editor should work # Changing to the default editor should work
user.preferred_editor = "default" user.preferred_editor = "default"
@ -54,6 +57,7 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest
assert_select ".alert-success", /^Preferences updated/ assert_select ".alert-success", /^Preferences updated/
assert_select "dd", "Default (currently iD)" assert_select "dd", "Default (currently iD)"
assert_equal "light", user.preferences.find_by(:k => "site.color_scheme")&.v assert_equal "light", user.preferences.find_by(:k => "site.color_scheme")&.v
assert_equal "light", user.preferences.find_by(:k => "map.color_scheme")&.v
end end
def test_update_preferred_site_color_scheme def test_update_preferred_site_color_scheme
@ -77,4 +81,26 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest
assert_select ".alert-success", /^Preferences updated/ assert_select ".alert-success", /^Preferences updated/
assert_equal "auto", user.preferences.find_by(:k => "site.color_scheme")&.v assert_equal "auto", user.preferences.find_by(:k => "site.color_scheme")&.v
end end
def test_update_preferred_map_color_scheme
user = create(:user, :languages => [])
session_for(user)
assert_nil user.preferences.find_by(:k => "map.color_scheme")
# Changing when previously not defined
put preferences_path, :params => { :user => user.attributes, :map_color_scheme => "light" }
assert_redirected_to preferences_path
follow_redirect!
assert_template :show
assert_select ".alert-success", /^Preferences updated/
assert_equal "light", user.preferences.find_by(:k => "map.color_scheme")&.v
# Changing when previously defined
put preferences_path, :params => { :user => user.attributes, :map_color_scheme => "auto" }
assert_redirected_to preferences_path
follow_redirect!
assert_template :show
assert_select ".alert-success", /^Preferences updated/
assert_equal "auto", user.preferences.find_by(:k => "map.color_scheme")&.v
end
end end