From 9533d26595fac3e651947a9f07d005dd3d852100 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Sat, 17 May 2025 13:36:28 +0300 Subject: [PATCH] Update basic preferences path helpers --- app/controllers/preferences_controller.rb | 2 +- app/views/layouts/_header.html.erb | 2 +- app/views/site/_potlatch.html.erb | 2 +- config/routes.rb | 2 +- .../preferences_controller_test.rb | 26 +++++++++---------- test/system/preferences_test.rb | 4 +-- test/system/view_communities_test.rb | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb index 910f6a24f..ac00f8d66 100644 --- a/app/controllers/preferences_controller.rb +++ b/app/controllers/preferences_controller.rb @@ -35,7 +35,7 @@ class PreferencesController < ApplicationController if success # Use a partial so that it is rendered during the next page load in the correct language. flash[:notice] = { :partial => "preferences/update_success_flash" } - redirect_to preferences_path + redirect_to basic_preferences_path else flash.now[:error] = t ".failure" render :show diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 62691fbbf..d140f22d1 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -86,7 +86,7 @@ <% end %> <%= link_to t("users.show.my profile"), current_user, :class => "dropdown-item" %> <%= link_to t("users.show.my_account"), account_path, :class => "dropdown-item" %> - <%= link_to t("users.show.my_preferences"), preferences_path, :class => "dropdown-item" %> + <%= link_to t("users.show.my_preferences"), basic_preferences_path, :class => "dropdown-item" %>
<% if current_user.home_location? %> <%= link_to t("layouts.home"), account_home_path, :class => "dropdown-item" %> diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb index 909a4cb41..bc6a590de 100644 --- a/app/views/site/_potlatch.html.erb +++ b/app/views/site/_potlatch.html.erb @@ -1,5 +1,5 @@

<%= t ".removed" %>

<%= t ".desktop_application_html", :download_link => link_to(t(".download"), t(".download_url")) %>

-

<%= t ".id_editor_html", :change_preferences_link => link_to(t(".change_preferences"), preferences_path) %>

+

<%= t ".id_editor_html", :change_preferences_link => link_to(t(".change_preferences"), basic_preferences_path) %>

diff --git a/config/routes.rb b/config/routes.rb index 0efad9f48..6e6da7586 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -318,7 +318,7 @@ OpenStreetMap::Application.routes.draw do resource :profile, :only => [:show, :update] get "/profile/edit", :to => redirect(:path => "/profile"), :as => nil - resource :preferences, :path => "preferences/basic", :only => [:show, :update] + resource :basic_preferences, :controller => :preferences, :path => "preferences/basic", :only => [:show, :update] get "/preferences", :to => redirect(:path => "/preferences/basic"), :as => nil get "/preferences/edit", :to => redirect(:path => "/preferences/basic"), :as => nil diff --git a/test/controllers/preferences_controller_test.rb b/test/controllers/preferences_controller_test.rb index ad156fa6b..33563b129 100644 --- a/test/controllers/preferences_controller_test.rb +++ b/test/controllers/preferences_controller_test.rb @@ -27,7 +27,7 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest session_for(user) # Changing to a invalid editor should fail - put preferences_path, :params => { :user => { :preferred_editor => "unknown", :languages => [] } } + put basic_preferences_path, :params => { :user => { :preferred_editor => "unknown", :languages => [] } } assert_response :success assert_template :show assert_select ".alert-success", false @@ -38,8 +38,8 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest assert_equal "light", user.preferences.find_by(:k => "map.color_scheme")&.v # Changing to a valid editor should work - put preferences_path, :params => { :user => { :preferred_editor => "id", :languages => [] } } - assert_redirected_to preferences_path + put basic_preferences_path, :params => { :user => { :preferred_editor => "id", :languages => [] } } + assert_redirected_to basic_preferences_path follow_redirect! assert_template :show assert_select ".alert-success", /^Preferences updated/ @@ -49,8 +49,8 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest assert_equal "light", user.preferences.find_by(:k => "map.color_scheme")&.v # Changing to the default editor should work - put preferences_path, :params => { :user => { :preferred_editor => "default", :languages => [] } } - assert_redirected_to preferences_path + put basic_preferences_path, :params => { :user => { :preferred_editor => "default", :languages => [] } } + assert_redirected_to basic_preferences_path follow_redirect! assert_template :show assert_select ".alert-success", /^Preferences updated/ @@ -66,16 +66,16 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest assert_nil user.preferences.find_by(:k => "site.color_scheme") # Changing when previously not defined - put preferences_path, :params => { :user => user.attributes, :site_color_scheme => "light" } - assert_redirected_to preferences_path + put basic_preferences_path, :params => { :user => user.attributes, :site_color_scheme => "light" } + assert_redirected_to basic_preferences_path follow_redirect! assert_template :show assert_select ".alert-success", /^Preferences updated/ assert_equal "light", user.preferences.find_by(:k => "site.color_scheme")&.v # Changing when previously defined - put preferences_path, :params => { :user => user.attributes, :site_color_scheme => "auto" } - assert_redirected_to preferences_path + put basic_preferences_path, :params => { :user => user.attributes, :site_color_scheme => "auto" } + assert_redirected_to basic_preferences_path follow_redirect! assert_template :show assert_select ".alert-success", /^Preferences updated/ @@ -88,16 +88,16 @@ class PreferencesControllerTest < ActionDispatch::IntegrationTest 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 + put basic_preferences_path, :params => { :user => user.attributes, :map_color_scheme => "light" } + assert_redirected_to basic_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 + put basic_preferences_path, :params => { :user => user.attributes, :map_color_scheme => "auto" } + assert_redirected_to basic_preferences_path follow_redirect! assert_template :show assert_select ".alert-success", /^Preferences updated/ diff --git a/test/system/preferences_test.rb b/test/system/preferences_test.rb index 89728a36e..4467ab43e 100644 --- a/test/system/preferences_test.rb +++ b/test/system/preferences_test.rb @@ -4,7 +4,7 @@ class PreferencesTest < ApplicationSystemTestCase def test_flash_message_shows_in_original_language sign_in_as(create(:user)) - visit preferences_path + visit basic_preferences_path click_on "Update Preferences" assert_content "Preferences updated" @@ -13,7 +13,7 @@ class PreferencesTest < ApplicationSystemTestCase def test_flash_message_shows_in_new_language sign_in_as(create(:user)) - visit preferences_path + visit basic_preferences_path fill_in "Preferred Languages", :with => "fr" click_on "Update Preferences" diff --git a/test/system/view_communities_test.rb b/test/system/view_communities_test.rb index b4b043edf..d4fb1893d 100644 --- a/test/system/view_communities_test.rb +++ b/test/system/view_communities_test.rb @@ -11,7 +11,7 @@ class ViewCommunitiesTest < ApplicationSystemTestCase def test_translated_links sign_in_as(create(:user)) - visit preferences_path + visit basic_preferences_path fill_in "Preferred Languages", :with => "fr" click_on "Update Preferences" -- 2.39.5