From 811bb04649365b0faaa00b1e0810bb101a4d19b1 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Fri, 26 Jun 2026 13:40:55 +0200 Subject: Stage 5 click-testing fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix link_to :method → button_to for all PUT/DELETE actions - Add button_to CSS reset to admin.css for visual consistency - Fix admin layout: replace broken jquery/jquery_ujs pipeline refs with admin_bundle via sprockets; add sprockets-rails, jquery-ui-rails gems - Add app/assets/javascripts/admin_bundle.js pipeline manifest - Fix event_information helper: use safe_join to avoid double-escaping - Fix nodes_helper: to_s(:db) → to_fs(:db) for event times - Fix revisions view: eliminate nested forms; diff button uses vanilla JS to collect radio button values before POST - Fix config/environments/development.rb and test.rb: cache_classes → enable_reloading - Add routing_filter_rails71_patch.rb version guard - Move LockedByAnotherUser to own file for Zeitwerk autoloading - Fix Globalize fallbacks via config.i18n.fallbacks in application.rb --- app/helpers/link_helper.rb | 12 ++++++------ app/helpers/nodes_helper.rb | 16 +++++++++++----- 2 files changed, 17 insertions(+), 11 deletions(-) (limited to 'app/helpers') diff --git a/app/helpers/link_helper.rb b/app/helpers/link_helper.rb index cb13c8d..ea6c26f 100644 --- a/app/helpers/link_helper.rb +++ b/app/helpers/link_helper.rb @@ -39,11 +39,11 @@ module LinkHelper end def unlock_link - message = "Are you sure you want to unlock?\n" + - "Locked by #{@node.lock_owner.login}\n" + - "Last modified #{@page.updated_at.to_fs(:db)}" - - link_to 'Unlock', unlock_node_path(@node), :method => :put, :data => { :confirm => message } + message = "Are you sure you want to unlock?\n" \ + "Locked by #{@node.lock_owner.login}\n" \ + "Last modified #{@page.updated_at.to_fs(:db)}" + button_to 'Unlock', unlock_node_path(@node), + method: :put, + form: { data: { confirm: message } } end - end diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb index c739ccd..a054a2e 100644 --- a/app/helpers/nodes_helper.rb +++ b/app/helpers/nodes_helper.rb @@ -28,14 +28,20 @@ module NodesHelper def user_list User.all.map {|u| [u.login, u.id]} end - + def event_information if @node.event - "#{@node.event.start_time.to_fs(:db)} - #{@node.event.end_time.to_fs(:db)} > " \ - "#{link_to 'show', event_path(@node.event)} " \ - "#{link_to 'edit', edit_event_path(@node.event)}" + safe_join([ + "#{@node.event.start_time.to_fs(:db)} - #{@node.event.end_time.to_fs(:db)} > ", + link_to('show', event_path(@node.event)), + ' ', + link_to('edit', edit_event_path(@node.event)) + ]) else - "no event attached > #{link_to 'add', new_event_path(:node_id => @node.id)}" + safe_join([ + 'no event attached > ', + link_to('add', new_event_path(:node_id => @node.id)) + ]) end end end -- cgit v1.3