From a1ddc25da0d2aa79a4d9216ef7792f26233bd38e Mon Sep 17 00:00:00 2001 From: erdgeist Date: Fri, 26 Jun 2026 05:19:28 +0200 Subject: Stage 5 fixes: RouteWithParams removal, Globalize fallbacks, search stub, to_s(:db) → to_fs(:db), LockedByAnotherUser autoload, test environment config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove safe_path helper and content_path shim from link_helper.rb - Update all safe_path call sites in views to use named route helpers directly - Fix Globalize fallbacks via config.i18n.fallbacks in application.rb, remove i18n initializer - Stub Node.search returning none (search disabled pending PostgreSQL upgrade) - Replace to_s(:db) with to_fs(:db) in node.rb, nodes_helper.rb, link_helper.rb, admin view - Move LockedByAnotherUser to app/models/locked_by_another_user.rb for Zeitwerk autoloading - Fix config/environments/test.rb: config.assets removed, cache_classes → enable_reloading, test_order removed, minitest pinned to ~> 5.25 - Fix config/environments/development.rb: cache_classes → enable_reloading - Park search vector migration in doc/ pending PostgreSQL and plpgsql availability --- config/application.rb | 1 + config/environments/development.rb | 2 +- config/environments/test.rb | 4 +--- config/initializers/i18n.rb | 3 --- config/initializers/will_paginate_patch.rb | 13 ------------- 5 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 config/initializers/i18n.rb delete mode 100644 config/initializers/will_paginate_patch.rb (limited to 'config') diff --git a/config/application.rb b/config/application.rb index 1a7f32b..d92802f 100644 --- a/config/application.rb +++ b/config/application.rb @@ -54,6 +54,7 @@ module Cccms # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')] config.i18n.default_locale = :de + config.i18n.fallbacks = { en: [:en, :de] } config.filter_parameters += [:password, :password_confirmation] config.serve_static_files = true diff --git a/config/environments/development.rb b/config/environments/development.rb index 8e2e7ef..43a6846 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -4,7 +4,7 @@ Cccms::Application.configure do # In the development environment your application's code is reloaded on # every request. This slows down response time but is perfect for development # since you don't have to restart the webserver when you make code changes. - config.cache_classes = false + config.enable_reloading = true # Log error messages when you accidentally call methods on nil. diff --git a/config/environments/test.rb b/config/environments/test.rb index a23c6d4..48aafe8 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,6 +1,6 @@ Cccms::Application.configure do - config.cache_classes = true + config.enable_reloading = false config.action_controller.consider_all_requests_local = true config.action_controller.perform_caching = false @@ -10,10 +10,8 @@ Cccms::Application.configure do config.action_mailer.delivery_method = :test config.active_support.deprecation = :log - config.active_support.test_order = :sorted config.eager_load = false config.public_file_server.enabled = true config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' } - config.assets.compile = true end diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb deleted file mode 100644 index 0190f63..0000000 --- a/config/initializers/i18n.rb +++ /dev/null @@ -1,3 +0,0 @@ -require "i18n/backend/fallbacks" -I18n::Backend::Simple.send(:include, I18n::Backend::Fallbacks) -I18n.fallbacks.map "en" => ["de"] diff --git a/config/initializers/will_paginate_patch.rb b/config/initializers/will_paginate_patch.rb deleted file mode 100644 index d03c882..0000000 --- a/config/initializers/will_paginate_patch.rb +++ /dev/null @@ -1,13 +0,0 @@ -require 'will_paginate/view_helpers/action_view' - -WillPaginate::ActionView::LinkRenderer.class_eval do - def url(page) - path = @template.request.path - page_param = WillPaginate::PageNumber(page) - if page_param == 1 - path - else - "#{path}?#{@options[:param_name]}=#{page}" - end - end -end -- cgit v1.3