From c06723ee715512c2033c7786c48f15674585b56b Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 26 Jun 2026 01:59:57 +0200
Subject: Stage 4: Rails 5.2 -> 6.1 on Ruby 2.7.2

- routing-filter 0.6.3 -> 0.7.0 (Rails 6.1 compatibility)
- RSS named routes rss_xml/rss_rdf added
- RouteWithParams workarounds: will_paginate_patch, content_path shim, safe_path helper
- Paperclip removed, replaced with FileAttachment concern (preserves URL scheme)
- Assets resource moved to /admin/assets (Sprockets middleware conflict)
- ApplicationRecord base class added, all models migrated
- Strong parameters added to Assets, Occurrences, Events, MenuItems controllers
- update_attributes -> update throughout
- render :nothing -> head :ok/:not_found throughout
- language_selector rewritten (removes :overwrite_params)
- Environment files updated for Rails 6.1 (eager_load, public_file_server, ActionMailer)
- Arel::Visitors::DepthFirst and Integer/Float duration patches removed from test_helper
- AssetsController tests added (10 tests covering upload, variants, destroy, auth)
- ImageMagick geometry: 460x250! for headline crop (not # which is invalid in IM6)

129 runs, 311 assertions, 5 failures (all pre-existing), 0 errors
---
 app/views/content/_search.html.erb         |  2 +-
 app/views/content/_tags.html.erb           |  2 +-
 app/views/layouts/application.html.erb     |  9 +++--
 app/views/layouts/application.html.erb.bak | 54 ------------------------------
 4 files changed, 6 insertions(+), 61 deletions(-)
 delete mode 100644 app/views/layouts/application.html.erb.bak

(limited to 'app/views')

diff --git a/app/views/content/_search.html.erb b/app/views/content/_search.html.erb
index aa914247..f732fcab 100644
--- a/app/views/content/_search.html.erb
+++ b/app/views/content/_search.html.erb
@@ -1,3 +1,3 @@
-<%= form_tag search_path, :method => 'get' do %>
+<%= form_tag safe_path(:search_path), :method => 'get' do %>
   <div><%= text_field_tag :search_term, params[:search_term], :placeholder => 'suchen', :type => 'search' %></div>
 <% end %>
diff --git a/app/views/content/_tags.html.erb b/app/views/content/_tags.html.erb
index 169ae841..387f51c8 100644
--- a/app/views/content/_tags.html.erb
+++ b/app/views/content/_tags.html.erb
@@ -3,7 +3,7 @@
   <h2>Tags</h2>
   <ul class="teasertext">
     <% @page.tags.each do |tag| %>
-      <li><%= link_to tag.name, tag_path(:id => tag.name) %></li>
+      <li><%= link_to tag.name, safe_path(:tag_path, tag.name) %></li>
     <% end %>
   </ul>
 </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 2a46f091..84dcdc65 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -16,8 +16,8 @@
     <%= stylesheet_link_tag "shadowbox" %>
     <%= javascript_include_tag 'public' %>
 
-    <%= auto_discovery_link_tag(:atom, {:locale => :de, :controller => "rss", :action => "updates", :format => :xml}) %>
-    <%= auto_discovery_link_tag(:rss,  {:locale => :de, :controller => "rss", :action => "updates", :format => :rdf}) %>
+    <%= auto_discovery_link_tag(:atom, '/rss/updates.xml', title: "ATOM") %>
+    <%= auto_discovery_link_tag(:rss,  '/rss/updates.rdf', title: "RSS") %>
 
     <script>
       (function() { document.addEventListener("DOMContentLoaded", function() {
@@ -32,7 +32,6 @@
     <div id="wrapper">
       <div id="header">
         <%= image_tag("header.png") %>
-        <!-- <%= link_to_path(image_tag("header.png"), "/home") %> -->
       </div>
       <div id="toolbox">
         <div id="search">
@@ -53,8 +52,8 @@
           <div class="main_navigation">
             <h2>Admin</h2>
             <ul>
-              <li><%= link_to raw('<span class="inactive admin_edit_link">⚙️ Overview</span>'),:controller => :admin, :action => 'index' %></li>
-              <li><%= link_to raw('<span class="inactive admin_edit_link">✎ Edit</span>'), node_path(:id => @page.node) %></li>
+              <li><%= link_to raw('<span class="inactive admin_edit_link">⚙️ Overview</span>'), safe_path(:admin_path) %></li>
+              <li><%= link_to raw('<span class="inactive admin_edit_link">✎ Edit</span>'), safe_path(:node_path, @page.node) %></li>
             </ul>
           </div>
         <% end %>
diff --git a/app/views/layouts/application.html.erb.bak b/app/views/layouts/application.html.erb.bak
deleted file mode 100644
index 3c95d75f..00000000
--- a/app/views/layouts/application.html.erb.bak
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-    <title><%= page_title %></title>
-    <%= stylesheet_link_tag "ccc" %>
-    <%= javascript_include_tag 'jquery-1.3.2.min' %>
-    <%= javascript_include_tag 'shadowbox/shadowbox' %>
-    <%= stylesheet_link_tag "shadowbox" %>
-    <%= javascript_include_tag 'public' %>
-
-    <%= auto_discovery_link_tag(:atom, {:locale => :de, :controller => "rss", :action => "updates", :format => :xml}) %>
-    <%= auto_discovery_link_tag(:rss,  {:locale => :de, :controller => "rss", :action => "updates", :format => :rdf}) %>
-  </head>
-
-  <body>
-    <div id="wrapper">
-      <div id="header">
-        <%= link_to_path(image_tag("header.png"), "/home") %>
-      </div>
-      <div id="search">
-        <%= render :partial => "content/search" %>
-      </div>
-      <div id="left_column">
-        <%= main_menu %>
-
-        <%= language_selector %>
-        <% if current_user && @page.node %>
-          <%= link_to "Edit", node_path(:id => @page.node) %>
-        <% end %>
-
-        <%= calendar %>
-      </div>
-      <div id="center_column">
-        <%= yield :layout %>
-
-        <div id="footer">
-          <br />
-          <br />
-          <p style="text-align: center">
-            <%= link_to t(:sponsors), content_path("sponsors") %>
-          </p>
-        </div>
-      </div>
-      <div id="right_column">
-        <%= tags %>
-        <%= featured_articles %>
-      </div>
-    </div>
-  </body>
-</html>
\ No newline at end of file
-- 
cgit v1.3