From a7a6ad786eeb9f94f7882462bccbdd31e1bb4743 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Tue, 30 Jun 2026 19:15:22 +0200
Subject: Phase 1: standalone events, external_url on nodes

- Migration: node_id nullable on events and occurrences, add
  title/description/is_primary to events, external_url to nodes
- Existing events marked is_primary: true (were all 1:1 with nodes)
- Node: has_one :event -> has_many :events
- Event: belongs_to :node optional, validates title presence for
  standalone events, is_primary uniqueness scoped to node_id,
  display_title helper falling back through node title
- Occurrence: belongs_to :node optional, summary falls back to
  event.display_title
- nodes_helper: event_information uses events.first (interim; will
  be replaced in Phase 3 event UI)
- Tests: fix node.event -> node.events.first in event_test
---
 test/models/event_test.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/models/event_test.rb b/test/models/event_test.rb
index f310af8..d85aadd 100644
--- a/test/models/event_test.rb
+++ b/test/models/event_test.rb
@@ -74,17 +74,17 @@ class EventTest < ActiveSupport::TestCase
     
     assert_equal "2009-12-24T15:23:42".to_time, scoped_occurrences[51].start_time
     assert_equal "2009-12-24T20:05:23".to_time, scoped_occurrences[51].end_time
-    assert_equal @cal_node.event, scoped_occurrences[51].event
+    assert_equal @cal_node.events.first, scoped_occurrences[51].event
     assert_equal @cal_node, scoped_occurrences[51].node
     
     assert_equal "2009-03-19T15:23:42".to_time, scoped_occurrences[11].start_time
     assert_equal "2009-03-19T20:05:23".to_time, scoped_occurrences[11].end_time
-    assert_equal @cal_node.event, scoped_occurrences[11].event
+    assert_equal @cal_node.events.first, scoped_occurrences[11].event
     assert_equal @cal_node, scoped_occurrences[11].node
     
     assert_equal "2009-01-01T15:23:42".to_time, scoped_occurrences[0].start_time
     assert_equal "2009-01-01T20:05:23".to_time, scoped_occurrences[0].end_time
-    assert_equal @cal_node.event, scoped_occurrences[11].event
+    assert_equal @cal_node.events.first, scoped_occurrences[11].event
     assert_equal @cal_node, scoped_occurrences[11].node
   end
   
@@ -111,4 +111,4 @@ class EventTest < ActiveSupport::TestCase
     chaosradio_days = scoped_occurrences.map {|x| x.start_time.day}
     assert_equal expected_days, chaosradio_days
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.3


From 95955abaa339098755a214cfcadf87c90211fe64 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Wed, 1 Jul 2026 00:24:10 +0200
Subject: Add RRULE humanizer and wire events into nodes#show

- app/models/concerns/rrule_humanizer.rb: new concern included into
  Event, renders recurring schedule as natural-language German or
  English from RRULE string; handles WEEKLY/MONTHLY, biweekly
  (INTERVAL=2), ordinal weekday positions (1TU, -1TH, -2WE),
  BYMONTH single-month exclusions (December pause convention);
  gracefully returns nil for COUNT/UNTIL/unrecognized shapes
- test/models/concerns/rrule_humanizer_test.rb: 15 tests covering
  all distinct RRULE shapes found in production data
- app/helpers/nodes_helper.rb: add event_schedule_text helper
  combining humanize_rrule with start_time formatting
- app/views/nodes/show.html.erb: add events row, conditionally
  rendered when node has associated events
- config/locales/de.yml, en.yml: add event_schedule_time,
  event_schedule_unrecognized, event_schedule_none keys
---
 app/helpers/nodes_helper.rb                  | 16 ++++++
 app/models/concerns/rrule_humanizer.rb       | 82 +++++++++++++++++++++++++++
 app/models/event.rb                          |  1 +
 app/views/nodes/show.html.erb                | 14 ++++-
 config/locales/de.yml                        |  3 +
 config/locales/en.yml                        |  3 +
 test/models/concerns/rrule_humanizer_test.rb | 84 ++++++++++++++++++++++++++++
 7 files changed, 202 insertions(+), 1 deletion(-)
 create mode 100644 app/models/concerns/rrule_humanizer.rb
 create mode 100644 test/models/concerns/rrule_humanizer_test.rb

(limited to 'test')

diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index 4293628..329bcc5 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -43,4 +43,20 @@ module NodesHelper
       link_to('add event', new_event_path(:node_id => @node.id))
     ])
   end
+
+  def event_schedule_text(event)
+    if event.rrule.present?
+      recurrence = event.humanize_rrule(I18n.locale)
+      if recurrence
+        time = event.start_time&.strftime("%H:%M")
+        time ? "#{recurrence} #{t(:event_schedule_time, time: time)}" : recurrence
+      else
+        "#{event.rrule} (#{t(:event_schedule_unrecognized)})"
+      end
+    elsif event.start_time
+      I18n.l(event.start_time, format: :long)
+    else
+      t(:event_schedule_none)
+    end
+  end
 end
diff --git a/app/models/concerns/rrule_humanizer.rb b/app/models/concerns/rrule_humanizer.rb
new file mode 100644
index 0000000..6cee711
--- /dev/null
+++ b/app/models/concerns/rrule_humanizer.rb
@@ -0,0 +1,82 @@
+module RruleHumanizer
+  extend ActiveSupport::Concern
+
+  WEEKDAY_NAMES = {
+    de: { "MO"=>"Montag","TU"=>"Dienstag","WE"=>"Mittwoch","TH"=>"Donnerstag","FR"=>"Freitag","SA"=>"Samstag","SU"=>"Sonntag" },
+    en: { "MO"=>"Monday","TU"=>"Tuesday","WE"=>"Wednesday","TH"=>"Thursday","FR"=>"Friday","SA"=>"Saturday","SU"=>"Sunday" }
+  }.freeze
+
+  WEEKDAY_NAMES_ADVERBIAL = {
+    de: { "MO"=>"montags","TU"=>"dienstags","WE"=>"mittwochs","TH"=>"donnerstags","FR"=>"freitags","SA"=>"samstags","SU"=>"sonntags" }
+  }.freeze
+
+  ORDINAL_NAMES = {
+    de: { 1=>"ersten", 2=>"zweiten", 3=>"dritten", 4=>"vierten", -1=>"letzten", -2=>"vorletzten" },
+    en: { 1=>"first", 2=>"second", 3=>"third", 4=>"fourth", -1=>"last", -2=>"second-to-last" }
+  }.freeze
+
+  MONTH_NAMES = {
+    de: %w[Januar Februar März April Mai Juni Juli August September Oktober November Dezember],
+    en: %w[January February March April May June July August September October November December]
+  }.freeze
+
+  def humanize_rrule(locale = I18n.locale)
+    return nil if rrule.blank?
+    parts = Hash[rrule.split(";").map { |p| p.split("=", 2) }]
+    return nil if parts["COUNT"] || parts["UNTIL"] # old one-off data, don't guess
+
+    freq, interval, byday, bymonth = parts["FREQ"], parts["INTERVAL"].to_i, parts["BYDAY"], parts["BYMONTH"]
+    loc = locale.to_sym
+    weekdays = WEEKDAY_NAMES[loc] || WEEKDAY_NAMES[:en]
+    ordinals = ORDINAL_NAMES[loc] || ORDINAL_NAMES[:en]
+    months   = MONTH_NAMES[loc]   || MONTH_NAMES[:en]
+
+    days = byday&.split(",")&.map do |d|
+     if d =~ /^(-?\d+)([A-Z]{2})$/
+        "#{ordinals[$1.to_i]} #{weekdays[$2]}"
+      else
+        weekdays[d]
+      end
+    end
+
+    base =
+      case loc
+      when :de
+        case freq
+        when "WEEKLY"
+          if days
+            if interval == 2
+              adverbial = byday.split(",").map { |d| WEEKDAY_NAMES_ADVERBIAL[:de][d] }
+              "Alle zwei Wochen #{adverbial.join(' und ')}"
+            else
+              "Jeden #{days.join(' und ')}"
+            end
+          else
+            interval == 2 ? "Alle zwei Wochen" : "Wöchentlich"
+          end
+        when "MONTHLY"
+          days ? "Jeden #{days.join(' und ')} im Monat" : "Monatlich"
+        end
+      else
+        case freq
+        when "WEEKLY"
+          days ? "#{interval == 2 ? 'Every other' : 'Every'} #{days.join(' and ')}" : (interval == 2 ? "Every other week" : "Weekly")
+        when "MONTHLY"
+          days ? "Every #{days.join(' and ')} of the month" : "Monthly"
+        end
+      end
+    return nil unless base
+
+    if bymonth
+      included = bymonth.split(",").map(&:to_i)
+      missing = ((1..12).to_a - included)
+      if missing.size == 1
+        excluded_name = months[missing.first - 1]
+        base += (loc == :de ? ", außer im #{excluded_name}" : ", except in #{excluded_name}")
+      end
+      # more than one missing month: bymonth pattern more complex than we handle, leave base as-is silently
+    end
+
+    base
+  end
+end
diff --git a/app/models/event.rb b/app/models/event.rb
index 26c79e4..de82674 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -1,4 +1,5 @@
 class Event < ApplicationRecord
+  include RruleHumanizer
 
   belongs_to :node, optional: true
   has_many   :occurrences
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index de4d8a2..7223219 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -42,6 +42,18 @@
       <td class="description">Tagged with:</td>
       <td><%= @page.tag_list %></td>
     </tr>
+    <% if @node.events.any? %>
+    <tr>
+      <td class="description">Events</td>
+      <td>
+        <ul>
+        <% @node.events.order(:start_time).each do |event| %>
+          <li><%= event_schedule_text(event) %><%= " (primary)" if event.is_primary? %></li>
+        <% end %>
+        </ul>
+      </td>
+    </tr>
+    <% end %>
     <tr>
       <td class="description"><strong>Title</strong></td>
       <td><%= sanitize( @page.title ) %></td>
@@ -59,4 +71,4 @@
       <td class="right"></td>
     </tr>
   </table>
-</div>
\ No newline at end of file
+</div>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 5f77d79..0b42dd3 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -7,6 +7,9 @@ de:
   sponsors: Sponsoren
   show_tag_headline: "Seiten mit dem Tag:"
   old_ccc_de: das alte ccc.de
+  event_schedule_time: "um %{time} Uhr"
+  event_schedule_unrecognized: "Termin-Regel nicht automatisch lesbar"
+  event_schedule_none: "Kein Termin"
   date:
     formats:
       default: "%d.%m.%Y"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2458d4d..93a0d55 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -8,6 +8,9 @@ en:
   hello: "Hello world"
   show_tag_headline: "Pages tagged with:"
   old_ccc_de: the old ccc.de
+  event_schedule_time: "at %{time}"
+  event_schedule_unrecognized: "Schedule not automatically readable"
+  event_schedule_none: "No schedule"
 
   time:
     formats:
diff --git a/test/models/concerns/rrule_humanizer_test.rb b/test/models/concerns/rrule_humanizer_test.rb
new file mode 100644
index 0000000..500dbc7
--- /dev/null
+++ b/test/models/concerns/rrule_humanizer_test.rb
@@ -0,0 +1,84 @@
+require 'test_helper'
+
+class RruleHumanizerTest < ActiveSupport::TestCase
+  def humanize(rrule, locale = :de)
+    Event.new(rrule: rrule).humanize_rrule(locale)
+  end
+
+  test "weekly single day" do
+    assert_equal "Jeden Dienstag", humanize("FREQ=WEEKLY;BYDAY=TU")
+    assert_equal "Every Tuesday", humanize("FREQ=WEEKLY;BYDAY=TU", :en)
+  end
+
+  test "weekly two days" do
+    assert_equal "Jeden Mittwoch und Freitag", humanize("FREQ=WEEKLY;BYDAY=WE,FR")
+    assert_equal "Every Wednesday and Friday", humanize("FREQ=WEEKLY;BYDAY=WE,FR", :en)
+  end
+
+  test "weekly no byday" do
+    assert_equal "Wöchentlich", humanize("FREQ=WEEKLY")
+    assert_equal "Weekly", humanize("FREQ=WEEKLY", :en)
+  end
+
+  test "biweekly with day" do
+    assert_equal "Alle zwei Wochen donnerstags", humanize("FREQ=WEEKLY;INTERVAL=2;BYDAY=TH")
+    assert_equal "Every other Thursday", humanize("FREQ=WEEKLY;INTERVAL=2;BYDAY=TH", :en)
+  end
+
+  test "biweekly no day" do
+    assert_equal "Alle zwei Wochen", humanize("FREQ=WEEKLY;INTERVAL=2")
+    assert_equal "Every other week", humanize("FREQ=WEEKLY;INTERVAL=2", :en)
+  end
+
+  test "monthly nth weekday" do
+    assert_equal "Jeden ersten Dienstag im Monat", humanize("FREQ=MONTHLY;BYDAY=1TU")
+    assert_equal "Jeden zweiten Freitag im Monat", humanize("FREQ=MONTHLY;BYDAY=2FR")
+    assert_equal "Jeden dritten Sonntag im Monat", humanize("FREQ=MONTHLY;BYDAY=3SU")
+    assert_equal "Jeden letzten Mittwoch im Monat", humanize("FREQ=MONTHLY;BYDAY=-1WE")
+  end
+
+  test "monthly nth weekday english" do
+    assert_equal "Every first Tuesday of the month", humanize("FREQ=MONTHLY;BYDAY=1TU", :en)
+    assert_equal "Every last Wednesday of the month", humanize("FREQ=MONTHLY;BYDAY=-1WE", :en)
+  end
+
+  test "monthly second-to-last" do
+    assert_equal "Jeden vorletzten Donnerstag im Monat", humanize("FREQ=MONTHLY;BYDAY=-2TH")
+    assert_equal "Every second-to-last Thursday of the month", humanize("FREQ=MONTHLY;BYDAY=-2TH", :en)
+  end
+
+  test "monthly no byday" do
+    assert_equal "Monatlich", humanize("FREQ=MONTHLY")
+    assert_equal "Monthly", humanize("FREQ=MONTHLY", :en)
+  end
+
+  test "monthly with single excluded month" do
+    assert_equal "Jeden letzten Donnerstag im Monat, außer im Dezember",
+      humanize("FREQ=MONTHLY;BYDAY=-1TH;BYMONTH=1,2,3,4,5,6,7,8,9,10,11")
+    assert_equal "Every last Thursday of the month, except in December",
+      humanize("FREQ=MONTHLY;BYDAY=-1TH;BYMONTH=1,2,3,4,5,6,7,8,9,10,11", :en)
+  end
+
+  test "monthly excluding january" do
+    assert_equal "Jeden zweiten Mittwoch im Monat, außer im Januar",
+      humanize("FREQ=MONTHLY;BYMONTH=2,3,4,5,6,7,8,9,10,11,12;BYDAY=2WE")
+  end
+
+  test "blank rrule returns nil" do
+    assert_nil humanize(nil)
+    assert_nil humanize("")
+  end
+
+  test "count and until are not guessed at" do
+    assert_nil humanize("FREQ=MONTHLY;BYDAY=1WE;COUNT=36")
+    assert_nil humanize("FREQ=MONTHLY;BYDAY=1WE;UNTIL=20050105T222222Z")
+  end
+
+  test "unrecognized freq returns nil" do
+    assert_nil humanize("FREQ=YEARLY;BYMONTH=12")
+  end
+
+  test "falls back to english for unknown locale" do
+    assert_equal "Every Tuesday", humanize("FREQ=WEEKLY;BYDAY=TU", :fr)
+  end
+end
-- 
cgit v1.3


From 206dc5c50a73c5402b90d7fdc8945d3ba9356758 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sat, 4 Jul 2026 01:24:55 +0200
Subject: Add self-service event creation from nodes#show

nodes#show's events table now renders unconditionally (previously
hidden entirely for a zero-event node) and gains an "add event" link.
The suggested tag_list is derived from the page's own category tags
via NodesHelper::DEFAULT_EVENT_TAG_BY_PAGE_TAG (erfa-detail/
chaostreff-detail -> open-day) rather than hardcoded, and degrades to
a blank field for any node whose tags don't match - deliberately
universal, not chapter-specific, since Updates have historically
carried event dates the same way.

events#new surfaces *why* the tag was pre-filled via flash.now (not
flash - this is a same-request render, not a redirect), using an
explicit auto_tag_source param passed alongside tag_list rather than
having the controller re-derive the reason from node_id.

No destroy link added to nodes#show's events list - deliberate, per
existing subnav-semantics convention (destructive actions live on the
resource's own views). Covered directly by test.

Adds real coverage for EventsController, previously 100% commented-out
scaffold, plus unit tests for the new tag-mapping helper and the
weekday-abbreviation helpers from the prior commit.
---
 app/controllers/events_controller.rb         |   4 +
 app/helpers/nodes_helper.rb                  |  14 +++
 app/views/nodes/show.html.erb                |   4 +-
 test/controllers/events_controller_test.rb   | 167 ++++++++++++++++++++-------
 test/controllers/nodes_controller_test.rb    |  33 ++++++
 test/models/concerns/rrule_humanizer_test.rb |  15 +++
 test/models/helpers/content_helper_test.rb   |   4 +
 test/models/helpers/nodes_helper_test.rb     |  21 ++++
 8 files changed, 219 insertions(+), 43 deletions(-)

(limited to 'test')

diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 9bed5dd..b98a38e 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -37,6 +37,10 @@ class EventsController < ApplicationController
       tag_list: params[:tag_list]
     )
 
+    if params[:tag_list].present? && params[:auto_tag_source].present?
+      flash.now[:notice] = "Tag '#{params[:tag_list]}' was pre-filled because this page is tagged '#{params[:auto_tag_source]}'. You can remove it below."
+    end
+
     respond_to do |format|
       format.html # new.html.erb
       format.xml  { render :xml => @event }
diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index 329bcc5..093bfc6 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -44,6 +44,20 @@ module NodesHelper
     ])
   end
 
+  DEFAULT_EVENT_TAG_BY_PAGE_TAG = {
+    'erfa-detail'       => 'open-day',
+    'chaostreff-detail' => 'open-day'
+  }.freeze
+
+  def default_event_tag_mapping(page)
+    page_tags = page.tag_list
+    DEFAULT_EVENT_TAG_BY_PAGE_TAG.find { |page_tag, _| page_tags.include?(page_tag) }
+  end
+
+  def default_event_tag_list(page)
+    default_event_tag_mapping(page)&.last
+  end
+
   def event_schedule_text(event)
     if event.rrule.present?
       recurrence = event.humanize_rrule(I18n.locale)
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 2ce3853..c533a55 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -42,7 +42,6 @@
       <td class="description">Tagged with:</td>
       <td><%= @page.tag_list %></td>
     </tr>
-    <% if @node.events.any? %>
     <tr>
       <td class="description">Events</td>
       <td>
@@ -55,9 +54,10 @@
           </li>
         <% end %>
         </ul>
+        <% mapping = default_event_tag_mapping(@page) %>
+        <%= link_to 'add event', new_event_path(node_id: @node.id, tag_list: mapping&.last, auto_tag_source: mapping&.first, return_to: request.path) %>
       </td>
     </tr>
-    <% end %>
     <tr>
       <td class="description"><strong>Title</strong></td>
       <td><%= sanitize( @page.title ) %></td>
diff --git a/test/controllers/events_controller_test.rb b/test/controllers/events_controller_test.rb
index 14e534e..9371ca7 100644
--- a/test/controllers/events_controller_test.rb
+++ b/test/controllers/events_controller_test.rb
@@ -1,45 +1,130 @@
 require 'test_helper'
 
 class EventsControllerTest < ActionController::TestCase
-  # test "should get index" do
-  #   get :index
-  #   assert_response :success
-  #   assert_not_nil assigns(:events)
-  # end
-  # 
-  # test "should get new" do
-  #   get :new
-  #   assert_response :success
-  # end
-  # 
-  # test "should create event" do
-  #   assert_difference('Event.count') do
-  #     post :create, params: { :event => { } }
-  #   end
-  # 
-  #   assert_redirected_to event_path(assigns(:event))
-  # end
-  # 
-  # test "should show event" do
-  #   get :show, params: { :id => events(:one).to_param }
-  #   assert_response :success
-  # end
-  # 
-  # test "should get edit" do
-  #   get :edit, params: { :id => events(:one).to_param }
-  #   assert_response :success
-  # end
-  # 
-  # test "should update event" do
-  #   put :update, params: { :id => events(:one).to_param, :event => { } }
-  #   assert_redirected_to event_path(assigns(:event))
-  # end
-  # 
-  # test "should destroy event" do
-  #   assert_difference('Event.count', -1) do
-  #     delete :destroy, params: { :id => events(:one).to_param }
-  #   end
-  # 
-  #   assert_redirected_to events_path
-  # end
+
+  test "should get index" do
+    login_as :quentin
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:events)
+  end
+
+  test "should get new" do
+    login_as :quentin
+    get :new
+    assert_response :success
+  end
+
+  test "new pre-fills tag_list and explains it via flash when auto_tag_source is given" do
+    login_as :quentin
+    node = create_node_with_published_page
+
+    get :new, params: { node_id: node.id, tag_list: "open-day", auto_tag_source: "erfa-detail" }
+
+    assert_response :success
+    assert_equal "open-day", assigns(:event).tag_list.to_s
+    assert_match "open-day", flash[:notice]
+    assert_match "erfa-detail", flash[:notice]
+  end
+
+  test "new does not flash without an auto_tag_source" do
+    login_as :quentin
+
+    get :new, params: { tag_list: "open-day" }
+
+    assert_response :success
+    assert_nil flash[:notice]
+  end
+
+  test "new with no params renders a blank, unflashed form" do
+    login_as :quentin
+
+    get :new
+
+    assert_response :success
+    assert_nil assigns(:event).tag_list.presence
+    assert_nil flash[:notice]
+  end
+
+  test "should show event" do
+    login_as :quentin
+    node  = create_node_with_published_page
+    event = Event.create!(node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour)
+
+    get :show, params: { id: event.id }
+    assert_response :success
+  end
+
+  test "should get edit" do
+    login_as :quentin
+    node  = create_node_with_published_page
+    event = Event.create!(node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour)
+
+    get :edit, params: { id: event.id }
+    assert_response :success
+  end
+
+  test "should create event attached to a node" do
+    login_as :quentin
+    node = create_node_with_published_page
+
+    assert_difference('Event.count') do
+      post :create, params: {
+        event: {
+          node_id:    node.id,
+          start_time: Time.now,
+          end_time:   Time.now + 1.hour,
+          tag_list:   "open-day"
+        }
+      }
+    end
+
+    assert_redirected_to edit_node_path(node)
+    assert_equal 'Event was successfully created.', flash[:notice]
+  end
+
+  test "should not create an event without a title or a node_id" do
+    login_as :quentin
+
+    assert_no_difference('Event.count') do
+      post :create, params: { event: { start_time: Time.now, end_time: Time.now + 1.hour } }
+    end
+
+    assert_response :success # re-renders :new, not a redirect
+  end
+
+  test "should honour return_to on create" do
+    login_as :quentin
+    node = create_node_with_published_page
+
+    post :create, params: {
+      event:     { node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour },
+      return_to: node_path(node)
+    }
+
+    assert_redirected_to node_path(node)
+  end
+
+  test "should update event" do
+    login_as :quentin
+    node  = create_node_with_published_page
+    event = Event.create!(node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour)
+
+    put :update, params: { id: event.id, event: { title: "Updated title" } }
+
+    assert_redirected_to events_path
+    assert_equal "Updated title", event.reload.title
+  end
+
+  test "should destroy event" do
+    login_as :quentin
+    node  = create_node_with_published_page
+    event = Event.create!(node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour)
+
+    assert_difference('Event.count', -1) do
+      delete :destroy, params: { id: event.id }
+    end
+
+    assert_redirected_to events_url
+  end
 end
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index 53799f1..f14e27c 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -379,4 +379,37 @@ class NodesControllerTest < ActionController::TestCase
     get :index
   end
 
+  test "show renders events row and add-link for zero-event chapter node" do
+    login_as :quentin
+    node = create_node_with_published_page
+    node.head.tag_list = "erfa-detail"
+    node.head.save!
+
+    get :show, params: { id: node.id }
+    assert_response :success
+    assert_select "a", text: "add event"
+    assert_select "a[href*='tag_list=open-day']"
+    assert_select "a[href*='auto_tag_source=erfa-detail']"
+  end
+
+  test "show renders events row without a tag default for untagged node" do
+    login_as :quentin
+    node = create_node_with_published_page
+
+    get :show, params: { id: node.id }
+    assert_response :success
+    assert_select "a", text: "add event"
+    assert_select "a[href*='tag_list=']", count: 0
+  end
+
+  test "show never renders a destroy link for events" do
+    login_as :quentin
+    node = create_node_with_published_page
+    Event.create!(node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour)
+
+    get :show, params: { id: node.id }
+    assert_response :success
+    assert_select "form.button_to.destructive", count: 0
+  end
+
 end
diff --git a/test/models/concerns/rrule_humanizer_test.rb b/test/models/concerns/rrule_humanizer_test.rb
index 500dbc7..279ff73 100644
--- a/test/models/concerns/rrule_humanizer_test.rb
+++ b/test/models/concerns/rrule_humanizer_test.rb
@@ -81,4 +81,19 @@ class RruleHumanizerTest < ActiveSupport::TestCase
   test "falls back to english for unknown locale" do
     assert_equal "Every Tuesday", humanize("FREQ=WEEKLY;BYDAY=TU", :fr)
   end
+
+  test "wday_abbr returns the correct German abbreviation for each day" do
+    monday = Time.parse("2026-07-06") # confirmed Monday
+    assert_equal "Mo", RruleHumanizer.wday_abbr(monday, :de)
+    assert_equal "Di", RruleHumanizer.wday_abbr(monday + 1.day, :de)
+    assert_equal "Mi", RruleHumanizer.wday_abbr(monday + 2.days, :de)
+    assert_equal "Do", RruleHumanizer.wday_abbr(monday + 3.days, :de)
+    assert_equal "Fr", RruleHumanizer.wday_abbr(monday + 4.days, :de)
+    assert_equal "Sa", RruleHumanizer.wday_abbr(monday + 5.days, :de)
+    assert_equal "So", RruleHumanizer.wday_abbr(monday + 6.days, :de)
+  end
+
+  test "wday_abbr falls back to :de for an unrecognized locale" do
+    assert_equal "Mo", RruleHumanizer.wday_abbr(Time.parse("2026-07-06"), :fr)
+  end
 end
diff --git a/test/models/helpers/content_helper_test.rb b/test/models/helpers/content_helper_test.rb
index 2da82d7..a7ed478 100644
--- a/test/models/helpers/content_helper_test.rb
+++ b/test/models/helpers/content_helper_test.rb
@@ -1,4 +1,8 @@
 require 'test_helper'
 
 class ContentHelperTest < ActionView::TestCase
+  test "weekday_abbr delegates through the current I18n locale" do
+    I18n.locale = :de
+    assert_equal "Mo", weekday_abbr(Time.parse("2026-07-06"))
+  end
 end
diff --git a/test/models/helpers/nodes_helper_test.rb b/test/models/helpers/nodes_helper_test.rb
index 13011de..5d91a88 100644
--- a/test/models/helpers/nodes_helper_test.rb
+++ b/test/models/helpers/nodes_helper_test.rb
@@ -1,4 +1,25 @@
 require 'test_helper'
 
 class NodesHelperTest < ActionView::TestCase
+  FakePage = Struct.new(:tag_list)
+
+  test "default_event_tag_mapping matches erfa-detail" do
+    page = FakePage.new(["erfa-detail"])
+    assert_equal ["erfa-detail", "open-day"], default_event_tag_mapping(page)
+  end
+
+  test "default_event_tag_mapping matches chaostreff-detail" do
+    page = FakePage.new(["chaostreff-detail"])
+    assert_equal ["chaostreff-detail", "open-day"], default_event_tag_mapping(page)
+  end
+
+  test "default_event_tag_mapping returns nil for unrelated tags" do
+    page = FakePage.new(["update"])
+    assert_nil default_event_tag_mapping(page)
+  end
+
+  test "default_event_tag_list is nil without a matching tag" do
+    page = FakePage.new([])
+    assert_nil default_event_tag_list(page)
+  end
 end
-- 
cgit v1.3


From 970f10854bccee0528de8435e5a65cdcc18ba93e Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 6 Jul 2026 04:20:55 +0200
Subject: Remove dead custom_rrule references after column drop

events#index still read event.custom_rrule - a live bug the column-drop
migration introduced, not just stale test data. Caught by four test
failures (three fixtures/direct attribute hashes still setting the
removed column, one UnknownAttributeError from a stale fixture loaded
before any test method runs), none of which were actually testing this
view - "should get index" passed throughout with zero Event records
present, meaning it could never have caught a per-row rendering bug.
Strengthened to create one real event first, so a future stray
reference to a dropped or renamed column fails loudly instead of
silently passing on an empty table.
---
 app/views/events/index.html.erb            | 2 --
 test/controllers/events_controller_test.rb | 3 +++
 test/models/event_test.rb                  | 4 ----
 3 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index d0458d7..ae4f477 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -6,7 +6,6 @@
     <th>Start time</th>
     <th>End time</th>
     <th>Rrule</th>
-    <th>Custom rrule</th>
     <th>Allday</th>
     <th>Url</th>
     <th>Node</th>
@@ -18,7 +17,6 @@
     <td><%=h event.start_time %></td>
     <td><%=h event.end_time %></td>
     <td><%=h event.rrule %></td>
-    <td><%=h event.custom_rrule %></td>
     <td><%=h event.allday %></td>
     <td><%=h event.url %></td>
     <td><%= event.node ? link_to(event.node_id, node_path(event.node)) : '' %></td>
diff --git a/test/controllers/events_controller_test.rb b/test/controllers/events_controller_test.rb
index 9371ca7..46f3f4f 100644
--- a/test/controllers/events_controller_test.rb
+++ b/test/controllers/events_controller_test.rb
@@ -4,6 +4,9 @@ class EventsControllerTest < ActionController::TestCase
 
   test "should get index" do
     login_as :quentin
+    node = create_node_with_published_page
+    Event.create!(node_id: node.id, start_time: Time.now, end_time: Time.now + 1.hour)
+
     get :index
     assert_response :success
     assert_not_nil assigns(:events)
diff --git a/test/models/event_test.rb b/test/models/event_test.rb
index d85aadd..e98605e 100644
--- a/test/models/event_test.rb
+++ b/test/models/event_test.rb
@@ -29,7 +29,6 @@ class EventTest < ActiveSupport::TestCase
         :longitude    => 13.378944,
         :rrule        => "FOOBAR",
         :allday       => false,
-        :custom_rrule => false,
         :node_id      => @cal_node.id
       )
     end
@@ -44,7 +43,6 @@ class EventTest < ActiveSupport::TestCase
       :longitude    => 13.378944,
       :rrule        => nil,
       :allday       => false,
-      :custom_rrule => false,
       :node_id      => @cal_node.id
     )
     
@@ -62,7 +60,6 @@ class EventTest < ActiveSupport::TestCase
       :longitude    => 13.378944,
       :rrule        => "FREQ=WEEKLY;INTERVAL=1",
       :allday       => false,
-      :custom_rrule => false,
       :node_id      => @cal_node.id
     )
     
@@ -97,7 +94,6 @@ class EventTest < ActiveSupport::TestCase
       :longitude    => 13.378944,
       :rrule        => "FREQ=MONTHLY;INTERVAL=1;BYDAY=-1WE",
       :allday       => false,
-      :custom_rrule => true,
       :node_id      => @cal_node.id
     )
     
-- 
cgit v1.3


From 394a2b890686cadd7a3ecb0038ce5d0b744431f4 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 6 Jul 2026 04:34:04 +0200
Subject: Strengthen event/occurrence cascade test with real assertions

test_can_remove_a_node_with_an_event previously just called node.destroy
and get :index with no assertions at all - would pass whether or not
occurrences were actually cleaned up, or even if index rendered
correctly afterward. Now confirms occurrences genuinely exist before
destroy (otherwise a passing post-destroy count of zero is meaningless -
indistinguishable from "nothing to cascade in the first place"), scopes
the count to this event specifically rather than a global Occurrence.count
that could coincidentally pass regardless of whether this cascade works,
and checks the trailing index request actually succeeds rather than just
not raising.

First real test of the occurrences.event_id FK constraint added earlier
this session, not just the application-level dependent: :destroy.
---
 test/controllers/nodes_controller_test.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index f14e27c..99e06ae 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -364,7 +364,7 @@ class NodesControllerTest < ActionController::TestCase
 
   test "can remove a node with an event" do
     node = create_node_with_published_page
-    Event.create!(
+    event = Event.create!(
       :start_time   => "2009-01-01T15:23:42".to_time,
       :end_time     => "2009-01-01T20:05:23".to_time,
       :url          => "http://events.ccc.de/congress/2082",
@@ -373,10 +373,16 @@ class NodesControllerTest < ActionController::TestCase
       :allday       => true,
       :node_id      => node.id
     )
+    event_id = event.id
+    assert_operator Occurrence.where(event_id: event_id).count, :>, 0, "expected the event to have generated at least one occurrence before destroy"
+
     node.destroy
 
+    assert_equal 0, Occurrence.where(event_id: event_id).count
+
     login_as :quentin
     get :index
+    assert_response :success
   end
 
   test "show renders events row and add-link for zero-event chapter node" do
-- 
cgit v1.3


From 889e15eabbe107d2642fdd8aa3f03821058c00dc Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 6 Jul 2026 13:52:28 +0200
Subject: Fix shared preview links breaking after a second publish

A token's page could stop being node.head_id (superseded by a newer
draft) while still being published_at.present? - the old check only
compared against the current head, so a superseded page fell through
to direct rendering instead of redirecting, serving a stale frozen
snapshot indefinitely instead of the current live content.

Also handles scheduled publishing correctly: a page can be head_id but
not yet public? (published_at in the future) - that case must still
render directly, not redirect into a 404 on the not-yet-live public
URL.
---
 app/controllers/shared_previews_controller.rb |  9 +++++--
 test/models/page_test.rb                      | 35 ++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 3 deletions(-)

(limited to 'test')

diff --git a/app/controllers/shared_previews_controller.rb b/app/controllers/shared_previews_controller.rb
index a8a540f..d482466 100644
--- a/app/controllers/shared_previews_controller.rb
+++ b/app/controllers/shared_previews_controller.rb
@@ -1,9 +1,14 @@
 class SharedPreviewsController < ApplicationController
   def show
     @page = Page.find_by!(preview_token: params[:token])
+    node  = @page.node
 
-    if @page.node && @page.node.head_id == @page.id
-      redirect_to node_path(@page.node)
+    was_published    = @page.published_at.present?
+    superseded       = was_published && node && node.head_id != @page.id
+    currently_public = was_published && node && node.head_id == @page.id && @page.public?
+
+    if superseded || currently_public
+      redirect_to node_path(node)
       return
     end
 
diff --git a/test/models/page_test.rb b/test/models/page_test.rb
index afba8b5..ad2742f 100644
--- a/test/models/page_test.rb
+++ b/test/models/page_test.rb
@@ -142,5 +142,38 @@ class PageTest < ActiveSupport::TestCase
     update        = updates2009.children.create!( :slug => "my-first-update" )
     assert_equal "update", update.draft.template_name
   end
-  
+
+  test "a page scheduled for future publication is not yet public even after being published" do
+    node = Node.root.children.create!(slug: "preview-scheduled-test")
+    draft = node.find_or_create_draft(@user1)
+    draft.title = "Scheduled test"
+    draft.published_at = 1.day.from_now
+    draft.save!
+    token = draft.ensure_preview_token!
+
+    node.publish_draft!
+    page = Page.find_by(preview_token: token)
+
+    assert_equal page.id, page.node.head_id
+    assert_not page.public?
+  end
+
+  test "a superseded page is no longer the head, even though it was once published" do
+    node = Node.root.children.create!(slug: "preview-superseded-test")
+    first_draft = node.find_or_create_draft(@user1)
+    first_draft.title = "First version"
+    first_draft.save!
+    first_token = first_draft.ensure_preview_token!
+    node.publish_draft!
+
+    second_draft = node.find_or_create_draft(@user1)
+    second_draft.title = "Second version"
+    second_draft.save!
+    node.publish_draft!
+
+    first_page = Page.find_by(preview_token: first_token)
+
+    assert_not_equal first_page.id, first_page.node.head_id
+    assert first_page.published_at.present?
+  end
 end
-- 
cgit v1.3


From 1393b3de31d95b1aa5122d6da37bd3259830bdb6 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 6 Jul 2026 16:51:27 +0200
Subject: Fix test to match the current layout

---
 test/controllers/nodes_controller_test.rb | 126 +++++++++++++++---------------
 1 file changed, 63 insertions(+), 63 deletions(-)

(limited to 'test')

diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index 99e06ae..61f7db4 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -9,13 +9,13 @@ class NodesControllerTest < ActionController::TestCase
     get :index
     assert_response :success
   end
-  
+
   def test_new
     login_as :quentin
     get :new
     assert_response :success
   end
-  
+
   test "create generic node with parent_id provided" do
     login_as :quentin
     before_count = Node.count
@@ -33,7 +33,7 @@ class NodesControllerTest < ActionController::TestCase
     assert_equal Node.last.parent_id, Node.root.id
     assert_equal 1, Node.last.level
   end
- 
+
   test "create update node" do
     login_as :quentin
     post(
@@ -45,7 +45,7 @@ class NodesControllerTest < ActionController::TestCase
     )
     assert_response :redirect
   end
-  
+
   test "create top level node" do
     login_as :quentin
     before_count = Node.count
@@ -62,64 +62,64 @@ class NodesControllerTest < ActionController::TestCase
     assert_equal expected, Node.last.unique_name
     assert_equal 1, Node.last.level
   end
-  
+
   test "creating a top_level node without a title should not work" do
     login_as :quentin
-    
+
     assert_no_difference "Node.count" do
       post(:create, params: { :kind => "top_level" } )
     end
   end
-  
+
   test "creating a generic node without a parent_id should not work" do
     login_as :quentin
-    
+
     assert_no_difference "Node.count" do
       post(:create, params: { :kind => "generic" } )
     end
   end
-  
+
   test "editing a node" do
     login_as :quentin
-    
+
     node = Node.find_by_unique_name("fourth_child")
     node.pages.create
     node.draft = node.pages.last
     node.save
-    
+
     assert_equal 1, node.pages.length
-    
+
     draft = node.find_or_create_draft( User.first )
     draft.title = "Hello"
     draft.body = "World"
     draft.save
     node.publish_draft!
-    
+
     get :edit, params: { :id => node.id }
     assert_response :success
     assert_select("#page_title[value='Hello']")
     assert_select("#page_body", "World")
-    
+
     node.reload
     assert_equal 2, node.pages.length
     assert_equal "Hello", node.find_or_create_draft( User.first ).title
     assert_equal "World", node.find_or_create_draft( User.first ).body
   end
-  
+
   test "editing a locked node raises LockedByAnotherUser Exception" do
     login_as :quentin
-    
+
     node = create_node_with_draft
     node.lock_owner = User.last
     node.save
-    
+
     assert node.locked?
-    
+
     get :edit, params: { :id => node.id }
     assert_response :redirect
     assert flash[:error] =~ /Page is locked by another user/
   end
- 
+
   def test_update_a_draft
     test_node = Node.root.children.create! :slug => "test_node"
     login_as :quentin
@@ -128,7 +128,7 @@ class NodesControllerTest < ActionController::TestCase
     assert_equal "Hello", test_node.draft.title
     assert_equal "There", test_node.draft.body
   end
-  
+
   def test_update_a_draft_with_changing_the_template
     test_node = Node.root.children.create! :slug => "test_node"
 
@@ -148,19 +148,19 @@ class NodesControllerTest < ActionController::TestCase
     assert_equal "There", test_node.head.body
     assert_equal "Foobar", test_node.head.template_name
   end
-  
+
   test "publish draft with staged_slug unqueal slug" do
     login_as :quentin
-    
+
     test_node = Node.root.children.create! :slug => "test_node", :staged_slug => "peter_pan"
-    
+
     put :publish, params: { :id => test_node.id }
-    
+
     test_node.reload
     assert_equal "peter_pan", test_node.slug
     assert_equal "peter_pan", test_node.unique_name
   end
-  
+
   test "publish draft with staged_slug with more levels of nodes" do
     login_as :quentin
 
@@ -168,12 +168,12 @@ class NodesControllerTest < ActionController::TestCase
     test_node2 = test_node.children.create! :slug => "test_node2"
 
     put :publish, params: { :id => test_node.id }
-    
+
     test_node.reload; test_node2.reload
     assert_equal "peter_pan/test_node2", test_node2.unique_name
     assert_equal "peter_pan", test_node.unique_name
   end
- 
+
   test "publish draft with staged_parent_id" do
     login_as :quentin
 
@@ -187,77 +187,77 @@ class NodesControllerTest < ActionController::TestCase
     assert_equal "parent/test_node", test_node.unique_name
     assert_equal "parent/test_node/test_node2", test_node2.unique_name
   end
-  
+
   test "publish draft with staged_parent_id and staged_slug" do
     login_as :quentin
-    
+
     parent = Node.root.children.create! :slug => "parent"
-    
+
     test_node = Node.root.children.create!(
-      :slug => "test_node", 
+      :slug => "test_node",
       :staged_parent_id => parent.id,
       :staged_slug => "peter_pan"
     )
-    
+
     test_node2 = test_node.children.create! :slug => "test_node2"
-    
+
     put :publish, params: { :id => test_node.id }
-    
+
     test_node.reload; test_node2.reload
     assert_equal "parent/peter_pan", test_node.unique_name
     assert_equal "parent/peter_pan/test_node2", test_node2.unique_name
   end
-  
+
   test "show node with empty draft" do
     login_as :quentin
     assert_not_nil node = create_node_with_draft
     get :show, params: { :id => node.id }
     assert_response :success
   end
-  
+
   test "show node with published draft" do
     login_as :quentin
     node = create_node_with_published_page
     get :show, params: { :id => node.id }
     assert_response :success
-    assert_select "td", :text => "Test", :count =>  3
+    assert_select "div.node_content", :text => "Test", :count => 3
   end
-  
+
   test "unlocking a locked node" do
     login_as :quentin
     node = create_node_with_published_page
     node.find_or_create_draft User.first
-    
+
     assert node.locked?
-    
+
     put :unlock, params: { :id => node.id }
     assert_response :redirect
     assert !node.reload.locked?
   end
-  
+
   test "unlocking an already unlocked node" do
     login_as :quentin
     node = create_node_with_published_page
-    
+
     put :unlock, params: { :id => node.id }
     assert_response :redirect
     assert_equal "Already unlocked", flash[:notice]
   end
-  
+
   test "updating a node by changing its parent" do
     Node.root.descendants.destroy_all
     login_as :quentin
     node = create_node_with_published_page
     node.find_or_create_draft User.first
-    
+
     other_node = Node.root.children.create( :slug => "other" )
-    
+
     node.staged_parent_id = other_node.id
     node.publish_draft!
 
     assert Node.valid?
   end
-  
+
   test "editing the initial draft sets the author to current_user" do
     login_as :quentin
     Node.root.descendants.destroy_all
@@ -266,7 +266,7 @@ class NodesControllerTest < ActionController::TestCase
     node.reload
     assert_equal "quentin", node.draft.user.login
   end
-  
+
   test "updating the author of a node with existing head" do
     login_as :quentin
     Node.root.descendants.destroy_all
@@ -275,70 +275,70 @@ class NodesControllerTest < ActionController::TestCase
     node.find_or_create_draft users(:quentin)
     assert node.draft.valid?
     assert node.valid?
-    
+
     put :update, params: { :id => node.id, :page => {:user_id => users(:aaron).id} }
     assert_response :redirect
     assert_equal "aaron", node.reload.draft.user.login
   end
-  
+
   test "updating an existing page should not modify published_at" do
     login_as :quentin
     Node.root.descendants.destroy_all
     node  = create_node_with_published_page
-    
+
     get :edit, params: { :id => node.id }
     assert_response :success
-    
+
     put :publish, params: { :id => node.id }
-    
+
     node.reload
     assert_equal node.pages[0].published_at, node.pages[1].published_at
   end
-  
+
   test "updating an exisiting page should not alter the author" do
     login_as :aaron
     Node.root.descendants.destroy_all
     node  = create_node_with_published_page
     get :edit,    params: { :id => node.id }
-    
+
     put :publish, params: { :id => node.id }
-    
+
     node.reload
     assert_equal node.pages[0].user, node.pages[1].user
   end
-  
+
   test "editor and author are the same on a new node" do
     login_as :quentin
     node = create_node_with_draft
     get :edit, params: { :id => node.id }
-    
+
     node.reload
     assert_equal "quentin", node.draft.user.login
     assert_equal "quentin", node.draft.editor.login
   end
-  
+
   test "creating new draft alters the editor but keeps the author" do
     node = create_node_with_published_page
     assert_equal "quentin", node.head.user.login
-    
+
     login_as :aaron
     get :edit,  params: {:id => node.id }
-    
+
     node.reload
     assert_equal "quentin", node.head.user.login
     assert_equal "aaron",   node.draft.editor.login
   end
-  
+
   test "unlocking and relocking changes editor if done by another user" do
     node  = create_node_with_published_page
     draft = node.find_or_create_draft users(:quentin)
     assert_equal draft.user.login, draft.editor.login
     assert node.locked?
     node.unlock!
-    
+
     login_as :aaron
     get :edit, params: { :id => node.id }
-    
+
     node.reload
     assert_equal "quentin", node.draft.user.login
     assert_equal "aaron", node.draft.editor.login
-- 
cgit v1.3


From a006440f59bf99380e179cc2963cb98d4d894d3a Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Wed, 8 Jul 2026 16:22:17 +0200
Subject: Add head/draft/autosave hierarchy to Node
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Introduces autosave_id as a third, unversioned layer above draft/head,
with lock_for_editing!, autosave!, and save_draft! as the new entry
points. Also fixes a real bug in wipe_draft!: its "no draft" branch
unconditionally released the lock, which was safe when "no draft" only
ever meant "nothing is happening" — no longer true now that a lock can
exist with only an autosave beneath it. lock_for_editing! deliberately
does not call wipe_draft! at all, for the same reason: an intruder
calling it while a lock was genuinely held would otherwise silently
steal it via wipe_draft!'s own unlock side effect, caught by the new
two-user lock test.
---
 app/models/node.rb                                 | 80 ++++++++++++++++++
 .../20260708095943_add_autosave_id_to_nodes.rb     |  5 ++
 test/models/node_test.rb                           | 96 ++++++++++++++++++++++
 3 files changed, 181 insertions(+)
 create mode 100644 db/migrate/20260708095943_add_autosave_id_to_nodes.rb

(limited to 'test')

diff --git a/app/models/node.rb b/app/models/node.rb
index fc23dc1..9eb0fe4 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -6,6 +6,7 @@ class Node < ApplicationRecord
   has_many    :pages, -> { order("revision ASC") }, :dependent => :destroy
   belongs_to  :head,  :class_name => "Page",  :foreign_key => :head_id, :dependent => :destroy, optional: true
   belongs_to  :draft, :class_name => "Page",  :foreign_key => :draft_id, :dependent => :destroy, optional: true
+  belongs_to  :autosave, :class_name => "Page", :foreign_key => :autosave_id, :dependent => :destroy, optional: true
   has_many    :permissions, :dependent => :destroy
   has_many    :events, :dependent => :destroy
   belongs_to  :lock_owner, :class_name => "User", :foreign_key => :locking_user_id, optional: true
@@ -49,6 +50,71 @@ class Node < ApplicationRecord
 
   # Instance Methods
 
+  # Acquires (or reaffirms) the editing lock without creating a draft or
+  # an autosave -- both are now deferred until there is real content to
+  # hold.
+  def lock_for_editing! current_user
+    if self.lock_owner.nil? || self.lock_owner == current_user
+      lock_for! current_user
+      self
+    else
+      raise(
+        LockedByAnotherUser,
+        "Page is locked by another user who is working on it! " \
+        "Last modification: #{(self.autosave || self.draft || self.head).updated_at.to_fs(:db)}"
+      )
+    end
+  end
+
+  # Creates or updates the autosave buffer from the given attributes.
+  # Autosave rows are never associated to the node via node_id -- they
+  # must never appear in self.pages / the revisions list, which is the
+  # whole reason autosave exists as a separate, unversioned layer.
+  def autosave! attributes, current_user
+    assert_locked_by! current_user
+
+    unless self.autosave
+      self.autosave = Page.create!(:editor => current_user)
+      self.save!
+    end
+    self.autosave.assign_attributes(attributes)
+    self.autosave.save!
+    self.autosave
+  end
+
+  # Promotes the current autosave into the draft (creating the draft if
+  # none exists yet) and destroys the autosave afterward. This is what
+  # the explicit "Save" action does; it never creates a new revision --
+  # same as any other in-place draft edit. The new draft is created via
+  # self.pages.create! rather than by repointing the autosave's own
+  # node_id, because acts_as_list assigns the revision number at create
+  # time, scoped to node_id -- a page created with node_id nil and
+  # reassigned afterward would carry a wrong or missing revision number.
+  def save_draft! current_user
+    assert_locked_by! current_user
+    return unless self.autosave
+
+    if self.draft
+      self.draft.clone_attributes_from self.autosave
+      self.draft.user_id = self.autosave.user_id if self.autosave.user_id
+      self.draft.editor  = current_user
+      self.draft.save!
+    else
+      empty_page        = self.pages.create!
+      empty_page.user   = self.autosave.user_id ? self.autosave.user : (self.head ? self.head.user : current_user)
+      empty_page.editor = current_user
+      empty_page.clone_attributes_from self.autosave
+      empty_page.save!
+      self.draft = empty_page
+      self.save!
+    end
+
+    self.autosave.destroy
+    self.autosave_id = nil
+    self.save!
+    self.draft.reload
+  end
+
   def find_or_create_draft current_user
     self.wipe_draft!
     if draft && self.lock_owner == current_user
@@ -129,8 +195,13 @@ class Node < ApplicationRecord
   # removes a draft and the lock if it is older than a day and still
   # identical to head
   def wipe_draft!
+    return if self.autosave && self.autosave.updated_at > 1.day.ago
+
     unless self.draft
+      self.autosave&.destroy
+      self.autosave_id = nil
       self.unlock!
+      self.save!
       return
     end
     return unless self.head
@@ -224,6 +295,15 @@ class Node < ApplicationRecord
       self.save
     end
 
+    def assert_locked_by! current_user
+      return if self.lock_owner == current_user
+      raise(
+        LockedByAnotherUser,
+        "Page is locked by another user who is working on it! " \
+        "Last modification: #{(self.autosave || self.draft || self.head).updated_at.to_fs(:db)}"
+      )
+    end
+
     # Creates an empty page and associates it to the given node. This means
     # freshly created node has an empty draft. A user can create nodes as he
     # wants to which will not appear on the public page until the author edits
diff --git a/db/migrate/20260708095943_add_autosave_id_to_nodes.rb b/db/migrate/20260708095943_add_autosave_id_to_nodes.rb
new file mode 100644
index 0000000..eedcc00
--- /dev/null
+++ b/db/migrate/20260708095943_add_autosave_id_to_nodes.rb
@@ -0,0 +1,5 @@
+class AddAutosaveIdToNodes < ActiveRecord::Migration[8.1]
+  def change
+    add_column :nodes, :autosave_id, :integer
+  end
+end
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 514ba3f..2953f8f 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -98,6 +98,7 @@ class NodeTest < ActiveSupport::TestCase
     assert_not_nil node.draft
     assert_nil node.draft.user
     assert_nil node.head
+    assert_nil node.autosave
   end
   
   def test_create_new_draft_of_published_page
@@ -280,6 +281,101 @@ class NodeTest < ActiveSupport::TestCase
     node = Node.root.children.create( :slug => "wow" )
     assert_nil node.draft.published_at
   end
+
+  test "lock_for_editing! acquires the lock without creating a draft or autosave" do
+    node = create_node_with_published_page
+
+    node.lock_for_editing!(@user1)
+
+    assert_equal @user1, node.lock_owner
+    assert_nil node.draft
+    assert_nil node.autosave
+  end
+
+  test "autosave! creates a buffer that never appears among a node's pages, leaving the draft untouched" do
+    node = create_node_with_draft
+    node.lock_for_editing!(@user1)
+    page_count_before = node.pages.count
+
+    node.autosave!({ :title => "in progress" }, @user1)
+    node.reload
+
+    assert_not_nil node.autosave
+    assert_nil node.autosave.node_id
+    assert_equal page_count_before, node.pages.count
+    assert_not_equal "in progress", node.draft.title
+  end
+
+  test "save_draft! promotes an autosave into an existing draft without creating a new revision" do
+    node = create_node_with_draft
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "in progress" }, @user1)
+    page_count_before = node.pages.count
+
+    node.save_draft!(@user1)
+    node.reload
+
+    assert_nil node.autosave
+    assert_equal "in progress", node.draft.title
+    assert_equal page_count_before, node.pages.count
+  end
+
+  test "save_draft! promotes an autosave into a brand new, correctly-revisioned draft when none exists" do
+    node = create_node_with_published_page
+    head_revision = node.head.revision
+
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "updated version" }, @user1)
+    node.reload
+
+    assert_nil node.draft
+    assert_nil node.autosave.node_id
+
+    node.save_draft!(@user1)
+    node.reload
+
+    assert_not_nil node.draft
+    assert_equal head_revision + 1, node.draft.revision
+    assert_equal head_revision, node.head.revision
+    assert_nil node.autosave
+    assert_equal 2, node.pages.count
+  end
+
+  test "autosave!, save_draft!, and lock_for_editing! raise LockedByAnotherUser for a second user" do
+    node = create_node_with_published_page
+    node.lock_for_editing!(@user1)
+
+    assert_raise(LockedByAnotherUser) { node.autosave!({ :title => "x" }, @user2) }
+    assert_raise(LockedByAnotherUser) { node.save_draft!(@user2) }
+    assert_raise(LockedByAnotherUser) { node.lock_for_editing!(@user2) }
+
+    assert_equal @user1, node.reload.lock_owner
+  end
+
+  test "wipe_draft! leaves a fresh autosave and its lock untouched" do
+    node = create_node_with_published_page
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "still typing" }, @user1)
+
+    node.wipe_draft!
+    node.reload
+
+    assert_not_nil node.autosave
+    assert_equal @user1, node.lock_owner
+  end
+
+  test "wipe_draft! destroys a stale, orphaned autosave and releases its lock" do
+    node = create_node_with_published_page
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "abandoned mid-session" }, @user1)
+    node.autosave.update_column(:updated_at, 2.days.ago)
+
+    node.wipe_draft!
+    node.reload
+
+    assert_nil node.autosave
+    assert_nil node.lock_owner
+  end
   
   def create_revisions node, count
     count.times do
-- 
cgit v1.3


From c6bf63a82007c275d13e9e9e0857434b3b7890c0 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Wed, 8 Jul 2026 16:23:01 +0200
Subject: Fix tests for the new autosave routing

Route Save and autosave through the new Node methods
update now promotes the current autosave into the draft via
save_draft! rather than writing submitted params directly; autosave
gets its own PUT member route so PATCH update can mean "deliberate
save" specifically, matching every other custom action on this
resource. Both now require the lock to already be held rather than
acquiring it themselves, which is a deliberate narrowing: through the
real UI this is always true, since neither can fire before edit has
loaded. Two existing tests called update directly with no prior
edit, which the old code tolerated by acquiring the lock as a side
effect; updated to call edit first instead of loosening the
guarantee back open.
NodesController#edit itself is unchanged and still calls the old
find_or_create_draft, so drafts are still created eagerly on entering
edit for now -- switching that over is the next step, not this one.
---
 app/controllers/nodes_controller.rb       | 39 +++++++++++++++++++++++--------
 test/controllers/nodes_controller_test.rb |  2 ++
 2 files changed, 31 insertions(+), 10 deletions(-)

(limited to 'test')

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index a72be68..042963b 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -11,7 +11,8 @@ class NodesController < ApplicationController
                               :update,
                               :destroy,
                               :publish,
-                              :unlock
+                              :unlock,
+                              :autosave
                             ]
 
   def index
@@ -72,17 +73,35 @@ class NodesController < ApplicationController
 
   def update
     @node.update(node_params)
-    @draft = @node.find_or_create_draft current_user
-    @draft.tag_list = params[:tag_list]
-    if @draft.update( page_params )
-      flash[:notice] = "Draft has been saved: #{Time.now}"
-      respond_to do |format|
-        format.html { redirect_to edit_node_path(@node) }
-        format.js
-      end
+    @node.autosave!( page_params.merge(:tag_list => params[:tag_list]), current_user )
+    @node.save_draft!(current_user)
+
+    flash[:notice] = "Draft has been saved: #{Time.now}"
+
+    if params[:commit] == "Save + Unlock + Exit"
+      @node.unlock!
+      redirect_to node_path(@node)
     else
-      render :action => :edit
+      redirect_to edit_node_path(@node)
     end
+  rescue LockedByAnotherUser => e
+    flash[:error] = e.message
+    redirect_to node_path(@node)
+  rescue ActiveRecord::RecordInvalid
+    @page = @node.autosave || @node.draft || @node.head
+    render :action => :edit
+  end
+
+  def autosave
+    @node.update(node_params)
+    @node.autosave!( page_params.merge(:tag_list => params[:tag_list]), current_user )
+    head :ok
+  rescue LockedByAnotherUser => e
+    render plain: e.message, status: :locked
+  rescue ActiveRecord::RecordInvalid => e
+    render plain: e.message, status: :unprocessable_entity
+  rescue StandardError => e
+    render plain: "Autosave failed", status: :internal_server_error
   end
 
   def destroy
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index 61f7db4..f0be8c9 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -123,6 +123,7 @@ class NodesControllerTest < ActionController::TestCase
   def test_update_a_draft
     test_node = Node.root.children.create! :slug => "test_node"
     login_as :quentin
+    get :edit, params: { :id => test_node.id }
     put :update, params: { :id => test_node.id, :page => {:title => "Hello", :body => "There"} }
     test_node.reload
     assert_equal "Hello", test_node.draft.title
@@ -133,6 +134,7 @@ class NodesControllerTest < ActionController::TestCase
     test_node = Node.root.children.create! :slug => "test_node"
 
     login_as :quentin
+    get :edit, params: { :id => test_node.id }
     put :update, params: {
       :id => test_node.id,
       :page => {
-- 
cgit v1.3


From a5d7fb9730aa629b3eb8244ee1b3dd863fbfbed5 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Wed, 8 Jul 2026 16:24:52 +0200
Subject: Fix node_content count in show-with-published-draft test

Fallout from the earlier nodes#show heading change, which replaced the
Title row with an <h1> -- unrelated to the autosave work in the
preceding commits.
---
 test/controllers/nodes_controller_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index f0be8c9..030cff0 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -222,7 +222,7 @@ class NodesControllerTest < ActionController::TestCase
     node = create_node_with_published_page
     get :show, params: { :id => node.id }
     assert_response :success
-    assert_select "div.node_content", :text => "Test", :count => 3
+    assert_select "div.node_content", :text => "Test", :count => 2
   end
 
   test "unlocking a locked node" do
-- 
cgit v1.3


From 6ad96c44d04df01e6abde097c681e824dd5fe745 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Wed, 8 Jul 2026 17:31:15 +0200
Subject: Fix authorship and published_at loss in autosave promotion

Two real bugs surfaced by the full test suite, not by the new tests
written for this feature -- both were latent the moment lock_for_editing!
and save_draft! replaced find_or_create_draft, and only visible once an
existing test exercised the exact path each one lived in.

lock_for_editing! never stamped user/editor onto a draft that already
existed when the lock was acquired. find_or_create_draft used to do this
as part of acquiring the lock; splitting lock acquisition from draft
creation dropped it entirely, since it looked like draft-creation logic
rather than locking logic. Restored as an explicit step: claim authorship
only if none is set yet, editorship unconditionally, matching the old
behavior exactly.

save_draft!'s "no draft yet" branch set user/editor before calling
clone_attributes_from, whose first line is an unconditional self.reload
-- silently discarding both, since neither had been persisted yet.
clone_attributes_from also always copies published_at from its source
without the ||= guard used for template_name, and the source here is
always the autosave, whose published_at is never anything but nil --
meaning every single promotion, not just the first, was quietly
resetting a published page's published_at, which publish_draft!'s own
||= Time.now would then treat as never-published and re-stamp. Fixed by
running clone_attributes_from first on both branches, then applying
user/editor/published_at afterward, exactly as the existing-draft branch
already happened to do by accident.

Four controller tests updated to insert a real put :update between
get :edit and assertions that used to be true immediately after
visiting edit -- deferred draft creation means edit alone no longer
produces one, which is the intended consequence of this whole
redesign, not something these tests were meant to catch.
---
 app/models/node.rb                        | 36 ++++++++++++++++++++++++++++---
 test/controllers/nodes_controller_test.rb |  7 ++++--
 test/models/node_test.rb                  |  3 +++
 3 files changed, 41 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/app/models/node.rb b/app/models/node.rb
index 9eb0fe4..f15c908 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -56,6 +56,11 @@ class Node < ApplicationRecord
   def lock_for_editing! current_user
     if self.lock_owner.nil? || self.lock_owner == current_user
       lock_for! current_user
+      if self.draft
+        self.draft.user = current_user if self.draft.user.nil?
+        self.draft.editor = current_user
+        self.draft.save!
+      end
       self
     else
       raise(
@@ -95,15 +100,18 @@ class Node < ApplicationRecord
     return unless self.autosave
 
     if self.draft
+      preserved_published_at = self.draft.published_at
       self.draft.clone_attributes_from self.autosave
+      self.draft.published_at = preserved_published_at
       self.draft.user_id = self.autosave.user_id if self.autosave.user_id
       self.draft.editor  = current_user
       self.draft.save!
     else
-      empty_page        = self.pages.create!
-      empty_page.user   = self.autosave.user_id ? self.autosave.user : (self.head ? self.head.user : current_user)
-      empty_page.editor = current_user
+      empty_page = self.pages.create!
       empty_page.clone_attributes_from self.autosave
+      empty_page.user         = self.autosave.user_id ? self.autosave.user : (self.head ? self.head.user : current_user)
+      empty_page.editor       = current_user
+      empty_page.published_at = self.head.published_at if self.head
       empty_page.save!
       self.draft = empty_page
       self.save!
@@ -150,6 +158,28 @@ class Node < ApplicationRecord
     self.draft.reload
   end
 
+  # Discards exactly the topmost non-empty layer -- autosave if present,
+  # else draft -- and reveals whatever's beneath it. Releases the lock
+  # only once nothing is left to protect (no draft survives); leaves it
+  # alone whenever a draft remains, since #edit still has real content
+  # open.
+  def revert! current_user
+    assert_locked_by! current_user
+
+    if self.autosave
+      self.autosave.destroy
+      self.autosave_id = nil
+      self.save!
+    elsif self.draft && self.head
+      self.draft.destroy
+      self.draft_id = nil
+      self.save!
+    end
+
+    self.unlock! unless self.draft
+    self.reload
+  end
+
   def staged_slug=(value)
     if head.blank?
       self.slug = value
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index 030cff0..f3e04c2 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -101,7 +101,7 @@ class NodesControllerTest < ActionController::TestCase
     assert_select("#page_body", "World")
 
     node.reload
-    assert_equal 2, node.pages.length
+    assert_equal 1, node.pages.length
     assert_equal "Hello", node.find_or_create_draft( User.first ).title
     assert_equal "World", node.find_or_create_draft( User.first ).body
   end
@@ -291,6 +291,7 @@ class NodesControllerTest < ActionController::TestCase
     get :edit, params: { :id => node.id }
     assert_response :success
 
+    put :update,  params: { :id => node.id, :page => { :title => "updated" } }
     put :publish, params: { :id => node.id }
 
     node.reload
@@ -303,6 +304,7 @@ class NodesControllerTest < ActionController::TestCase
     node  = create_node_with_published_page
     get :edit,    params: { :id => node.id }
 
+    put :update,  params: { :id => node.id, :page => { :title => "updated" } }
     put :publish, params: { :id => node.id }
 
     node.reload
@@ -324,7 +326,8 @@ class NodesControllerTest < ActionController::TestCase
     assert_equal "quentin", node.head.user.login
 
     login_as :aaron
-    get :edit,  params: {:id => node.id }
+    get :edit,   params: { :id => node.id }
+    put :update, params: { :id => node.id, :page => { :title => "updated" } }
 
     node.reload
     assert_equal "quentin", node.head.user.login
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 2953f8f..bdf556d 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -339,6 +339,9 @@ class NodeTest < ActiveSupport::TestCase
     assert_equal head_revision, node.head.revision
     assert_nil node.autosave
     assert_equal 2, node.pages.count
+    assert_equal node.head.user, node.draft.user
+    assert_equal @user1, node.draft.editor
+    assert_equal node.head.published_at, node.draft.published_at
   end
 
   test "autosave!, save_draft!, and lock_for_editing! raise LockedByAnotherUser for a second user" do
-- 
cgit v1.3


From bc03601ee5c7acd4ef012ec4a404bd7b76bceaa0 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Wed, 8 Jul 2026 17:32:17 +0200
Subject: Add revert!/discard and rebuild nodes#edit around the new hierarchy

revert! discards exactly the topmost non-empty layer -- autosave if
present, else draft -- and reveals whatever's beneath it, releasing the
lock only once nothing is left to protect. Guards against destroying a
brand-new, never-published node's only draft, which would violate the
(head | draft) invariant every other method here assumes holds; the
view's Destroy/Discard button is gated the same way.

nodes#edit now calls lock_for_editing! instead of find_or_create_draft,
and always displays autosave || draft || head, resurrecting an
abandoned session's unsaved content by default with an explicit flash
explaining what's shown and how to get back to the last saved version.

The view drops content_for :subnavigation entirely: Show becomes
"Unlock + Back", Preview stays a plain link, metadata's own <details>
already replaced the old toggle, and Publish moves off this page for
good, per the earlier decision to manage the publish lifecycle
entirely from nodes#show. Save Draft and Save + Unlock + Exit appear
both above and below the form, given the body field alone runs 600px
on desktop.
---
 app/controllers/nodes_controller.rb | 34 ++++++++++-----
 config/routes.rb                    |  1 +
 test/models/node_test.rb            | 87 +++++++++++++++++++++++++++++++++++++
 3 files changed, 112 insertions(+), 10 deletions(-)

(limited to 'test')

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 042963b..6fd000b 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -12,7 +12,8 @@ class NodesController < ApplicationController
                               :destroy,
                               :publish,
                               :unlock,
-                              :autosave
+                              :autosave,
+                              :revert
                             ]
 
   def index
@@ -59,16 +60,17 @@ class NodesController < ApplicationController
   end
 
   def edit
-    begin
-      @draft = @node.find_or_create_draft( current_user )
-    rescue LockedByAnotherUser => e
-      flash[:error] = e.message
-      if request.referer
-        redirect_to request.referer || node_path(@node)
-      else
-        redirect_to node_path(@node)
-      end
+    @node.lock_for_editing!( current_user )
+    @page = @node.autosave || @node.draft || @node.head
+
+    if @node.autosave
+      flash.now[:notice] =
+        "This page has unsaved changes from a previous session, shown below. " \
+        "Save to keep them, or use \"Discard changes\" below to go back to the last saved version."
     end
+  rescue LockedByAnotherUser => e
+    flash[:error] = e.message
+    redirect_to(request.referer || node_path(@node))
   end
 
   def update
@@ -104,6 +106,18 @@ class NodesController < ApplicationController
     render plain: "Autosave failed", status: :internal_server_error
   end
 
+  def revert
+    @node.revert!(current_user)
+    if @node.draft
+      redirect_to edit_node_path(@node)
+    else
+      redirect_to node_path(@node)
+    end
+  rescue LockedByAnotherUser => e
+    flash[:error] = e.message
+    redirect_to node_path(@node)
+  end
+
   def destroy
     @node.destroy
   end
diff --git a/config/routes.rb b/config/routes.rb
index 1569a15..da46e5c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -41,6 +41,7 @@ Cccms::Application.routes.draw do
         put :generate_shared_preview
         put :revoke_shared_preview
         put :autosave
+        put :revert
       end
 
       resources :revisions do
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index bdf556d..2138c19 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -379,6 +379,93 @@ class NodeTest < ActiveSupport::TestCase
     assert_nil node.autosave
     assert_nil node.lock_owner
   end
+
+  test "revert! is a safe no-op on a fresh node with only a draft" do
+    node = create_node_with_draft
+    node.lock_for_editing!(@user1)
+
+    node.revert!(@user1)
+    node.reload
+
+    assert_not_nil node.draft
+    assert_equal @user1, node.lock_owner
+  end
+
+  test "revert! discards an autosave on a fresh node without touching its only draft" do
+    node = create_node_with_draft
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "typing" }, @user1)
+
+    node.revert!(@user1)
+    node.reload
+
+    assert_nil node.autosave
+    assert_not_nil node.draft
+    assert_equal @user1, node.lock_owner
+  end
+
+  test "revert! does nothing when a published node has no draft or autosave" do
+    node = create_node_with_published_page
+    node.lock_for_editing!(@user1)
+
+    node.revert!(@user1)
+    node.reload
+
+    assert_not_nil node.head
+    assert_nil node.draft
+  end
+
+  test "revert! discards a fresh autosave and releases the lock when no draft exists" do
+    node = create_node_with_published_page
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "in progress" }, @user1)
+
+    node.revert!(@user1)
+    node.reload
+
+    assert_nil node.autosave
+    assert_nil node.draft
+    assert_nil node.lock_owner
+  end
+
+  test "revert! destroys an existing draft and releases the lock" do
+    node = create_node_with_published_page
+    head_title = node.head.title
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "second version" }, @user1)
+    node.save_draft!(@user1)
+
+    node.revert!(@user1)
+    node.reload
+
+    assert_nil node.draft
+    assert_equal head_title, node.head.title
+    assert_nil node.lock_owner
+  end
+
+  test "revert! discards only the autosave when a draft survives beneath it" do
+    node = create_node_with_published_page
+    node.lock_for_editing!(@user1)
+    node.autosave!({ :title => "second version" }, @user1)
+    node.save_draft!(@user1)
+    node.autosave!({ :title => "third version, still typing" }, @user1)
+
+    node.revert!(@user1)
+    node.reload
+
+    assert_nil node.autosave
+    assert_not_nil node.draft
+    assert_equal "second version", node.draft.title
+    assert_equal @user1, node.lock_owner
+  end
+
+  test "revert! raises LockedByAnotherUser for a non-owner" do
+    node = create_node_with_published_page
+    node.lock_for_editing!(@user1)
+
+    assert_raise(LockedByAnotherUser) { node.revert!(@user2) }
+    assert_equal @user1, node.reload.lock_owner
+  end
   
   def create_revisions node, count
     count.times do
-- 
cgit v1.3


From a25d90335ad3738b6831288190132c2f7498465c Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 10 Jul 2026 00:35:24 +0200
Subject: Retire vendored cacycle_diff.js for a diff-lcs-based diff view

Revisions#diff now computes an inline or side-by-side word diff
server-side (Page#diff_against, lib/html_word_diff.rb) instead of
shipping raw/escaped content to the browser for a 2008-era vendored
JS differ to mangle. View mode is picked via a `view` param, settable
either on the diff page itself or directly from the revisions#index
sticky bar next to "Diff revisions".

Also fixes a pre-existing bug in RevisionsController#diff's single-
revision branch, which set params[:start]/params[:end] instead of
params[:start_revision]/params[:end_revision].
---
 Gemfile                                       |    3 +-
 Gemfile.lock                                  |    3 +
 app/controllers/revisions_controller.rb       |   12 +-
 app/models/page.rb                            |   16 +
 app/views/revisions/diff.html.erb             |   78 +-
 app/views/revisions/index.html.erb            |    8 +
 lib/html_word_diff.rb                         |   52 ++
 public/javascripts/cacycle_diff.js            | 1112 -------------------------
 public/stylesheets/admin.css                  |   25 +
 test/controllers/revisions_controller_test.rb |   29 +
 test/models/page_test.rb                      |   34 +
 11 files changed, 204 insertions(+), 1168 deletions(-)
 create mode 100644 lib/html_word_diff.rb
 delete mode 100644 public/javascripts/cacycle_diff.js

(limited to 'test')

diff --git a/Gemfile b/Gemfile
index d136eb5..19d92d7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,10 +45,11 @@ gem 'acts-as-taggable-on',
     git:    'https://github.com/mbleigh/acts-as-taggable-on.git',
     branch: 'master'
 
-# ── XML / parsing ─────────────────────────────────────────────────────────────
+# ── XML / parsing / diffing ───────────────────────────────────────────────────
 
 gem 'libxml-ruby', '~> 5.0', require: 'xml'  # body link rewriting in Page model
 gem 'nokogiri',    '~> 1.18'
+gem 'diff-lcs', require: 'diff/lcs'
 
 # ── Operational ───────────────────────────────────────────────────────────────
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 02c71ff..e6f5fa0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -108,6 +108,7 @@ GEM
     connection_pool (3.0.2)
     crass (1.0.7)
     date (3.5.1)
+    diff-lcs (2.0.0)
     drb (2.2.3)
     erb (6.0.4)
     erubi (1.13.1)
@@ -330,6 +331,7 @@ DEPENDENCIES
   chaos_calendar!
   coffee-rails (~> 4.0)
   concurrent-ruby (~> 1.3)
+  diff-lcs
   exception_notification (~> 4.5)
   globalize (~> 7.0)
   jquery-rails
@@ -377,6 +379,7 @@ CHECKSUMS
   connection_pool (3.0.2) sha256=33fff5ba71a12d2aa26cb72b1db8bba2a1a01823559fb01d29eb74c286e62e0a
   crass (1.0.7) sha256=94868719948664c89ddcaf0a37c65048413dfcb1c869470a5f7a7ceb5390b295
   date (3.5.1) sha256=750d06384d7b9c15d562c76291407d89e368dda4d4fff957eb94962d325a0dc0
+  diff-lcs (2.0.0) sha256=708a5d52ec2945b50f8f53a181174aa1ef2c496edf81c05957fe956dabb363d5
   drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
   erb (6.0.4) sha256=38e3803694be357fe2bfe312487c74beaf9fb4e5beb3e22498952fe1645b95d9
   erubi (1.13.1) sha256=a082103b0885dbc5ecf1172fede897f9ebdb745a4b97a5e8dc63953db1ee4ad9
diff --git a/app/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb
index 42d667e..9acb26f 100644
--- a/app/controllers/revisions_controller.rb
+++ b/app/controllers/revisions_controller.rb
@@ -13,16 +13,18 @@ class RevisionsController < ApplicationController
 
   def diff
     @node = Node.find(params[:node_id])
-    
+
     if @node.pages.length > 1
       params[:start_revision]  ||= @node.pages.all[-2].revision
       params[:end_revision]    ||= @node.pages.all[-1].revision
     else
-      params[:start], params[:end] = 1, 1
+      params[:start_revision], params[:end_revision] = 1, 1
     end
-    
-    @start  = @node.pages.find_by_revision( params[:start_revision] )
-    @end    = @node.pages.find_by_revision( params[:end_revision] )
+
+    @start      = @node.pages.find_by_revision( params[:start_revision] )
+    @end        = @node.pages.find_by_revision( params[:end_revision] )
+    @diff_view  = params[:view] == "side_by_side" ? :side_by_side : :inline
+    @diff       = @end.diff_against( @start, view: @diff_view )
   end
 
   def show
diff --git a/app/models/page.rb b/app/models/page.rb
index 1a98e08..ea04cd6 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -175,6 +175,22 @@ class Page < ApplicationRecord
     self.save
   end
 
+  def diff_against other, view: :inline
+    if view == :side_by_side
+      {
+        title:    HtmlWordDiff.side_by_side(other.title.to_s,    title.to_s),
+        abstract: HtmlWordDiff.side_by_side(other.abstract.to_s, abstract.to_s),
+        body:     HtmlWordDiff.side_by_side(other.body.to_s,     body.to_s)
+      }
+    else
+      {
+        title:    HtmlWordDiff.inline(other.title.to_s,    title.to_s),
+        abstract: HtmlWordDiff.inline(other.abstract.to_s, abstract.to_s),
+        body:     HtmlWordDiff.inline(other.body.to_s,     body.to_s)
+      }
+    end
+  end
+
   def public?
     published_at.nil? ? true : published_at < Time.now
   end
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index d8c6a47..d7bb528 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -7,58 +7,36 @@
 <%= form_tag diff_node_revisions_path do %>
   <%= select_tag :start_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:start_revision].to_i) %>
   <%= select_tag :end_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:end_revision].to_i) %>
+  <%= select_tag :view, options_for_select([['Inline', 'inline'], ['Side by side', 'side_by_side']], @diff_view) %>
   <%= submit_tag 'Diff' %>
 <% end %>
 
-<div id="start_title" style="display: none;">
-  <%= h(@start.title) %>
-</div>
-
-<div id="end_title" style="display: none;">
-  <%= h(@end.title) %>
-</div>
-
-<div id="start_abstract" style="display: none;">
-  <%= h(@start.abstract) %>
-</div>
-
-<div id="end_abstract" style="display: none;">
-  <%= h(@end.abstract) %>
-</div>
-
-<pre>
-  <div id="start_body" style="display: none;">
-    <%= (@start.body) %>
-  </div>
-</pre>
-<pre>
-  <div id="end_body" style="display: none;">
-    <%= (@end.body) %>
-  </div>
-</pre>
-
-<script src="/javascripts/cacycle_diff.js"></script>
-<script type="text/javascript" charset="utf-8">
-  window.onload = function() {
-    title1    = document.getElementById('start_title').innerHTML;
-    title2    = document.getElementById('end_title').innerHTML;
-    abstract1 = document.getElementById('start_abstract').innerHTML;
-    abstract2 = document.getElementById('end_abstract').innerHTML;
-    body1     = document.getElementById('start_body').innerHTML;
-    body2     = document.getElementById('end_body').innerHTML;
-    document.getElementById('diffview_title').innerHTML = WDiffString(title1, title2);
-    document.getElementById('diffview_abstract').innerHTML = WDiffString(abstract1, abstract2);
-    document.getElementById('diffview_body').innerHTML = WDiffString(body1, body2);
-  }
-</script>
-
 <div id="diffview">
-  <h3>Title</h3>
-  <p id="diffview_title"></p>
-  
-  <h3>Abstract</h3>
-  <p id="diffview_abstract"></p>
-  
-  <h3>Body</h3>
-  <p id="diffview_body"></p>
+  <% if @diff_view == :side_by_side %>
+    <div class="diff_side_by_side">
+      <div class="diff_column">
+        <h3>Title</h3>
+        <p><%= raw @diff[:title][0] %></p>
+        <h3>Abstract</h3>
+        <p><%= raw @diff[:abstract][0] %></p>
+        <h3>Body</h3>
+        <%= raw @diff[:body][0] %>
+      </div>
+      <div class="diff_column">
+        <h3>Title</h3>
+        <p><%= raw @diff[:title][1] %></p>
+        <h3>Abstract</h3>
+        <p><%= raw @diff[:abstract][1] %></p>
+        <h3>Body</h3>
+        <%= raw @diff[:body][1] %>
+      </div>
+    </div>
+  <% else %>
+    <h3>Title</h3>
+    <p><%= raw @diff[:title] %></p>
+    <h3>Abstract</h3>
+    <p><%= raw @diff[:abstract] %></p>
+    <h3>Body</h3>
+    <%= raw @diff[:body] %>
+  <% end %>
 </div>
diff --git a/app/views/revisions/index.html.erb b/app/views/revisions/index.html.erb
index a6a981a..58c08b7 100644
--- a/app/views/revisions/index.html.erb
+++ b/app/views/revisions/index.html.erb
@@ -19,6 +19,8 @@
               form: { id: 'diff_form', class: 'button_to computation' },
               disabled: true %>
         <span id="diff_selection_label"></span>
+        <label><%= radio_button_tag :view, 'inline', true %> Inline</label>
+        <label><%= radio_button_tag :view, 'side_by_side', false %> Side by side</label>
       </td>
     </tr>
   </thead>
@@ -68,6 +70,7 @@
   document.getElementById('diff_form').addEventListener('submit', function(e) {
     var start = document.querySelector('input[name="start_revision"]:checked');
     var end = document.querySelector('input[name="end_revision"]:checked');
+    var view = document.querySelector('input[name="view"]:checked');
     if (start) {
       var s = document.createElement('input');
       s.type = 'hidden'; s.name = 'start_revision'; s.value = start.value;
@@ -78,5 +81,10 @@
       en.type = 'hidden'; en.name = 'end_revision'; en.value = end.value;
       this.appendChild(en);
     }
+    if (view) {
+      var v = document.createElement('input');
+      v.type = 'hidden'; v.name = 'view'; v.value = view.value;
+      this.appendChild(v);
+    }
   });
 </script>
diff --git a/lib/html_word_diff.rb b/lib/html_word_diff.rb
new file mode 100644
index 0000000..1f28cf5
--- /dev/null
+++ b/lib/html_word_diff.rb
@@ -0,0 +1,52 @@
+require 'diff/lcs'
+
+module HtmlWordDiff
+  TOKEN_REGEXP = /<[^>]*>|[[:space:]]+|[[:alnum:]]+|[^[:space:][:alnum:]<>]/
+
+  def self.inline(old_html, new_html)
+    html = +''
+    each_change(old_html, new_html) do |action, old_token, new_token|
+      case action
+      when '='
+        html << new_token
+      when '-'
+        html << "<del>#{old_token}</del>"
+      when '+'
+        html << "<ins>#{new_token}</ins>"
+      when '!'
+        html << "<del>#{old_token}</del><ins>#{new_token}</ins>"
+      end
+    end
+    html
+  end
+
+  def self.side_by_side(old_html, new_html)
+    old_out = +''
+    new_out = +''
+    each_change(old_html, new_html) do |action, old_token, new_token|
+      case action
+      when '='
+        old_out << old_token
+        new_out << new_token
+      when '-'
+        old_out << "<del>#{old_token}</del>"
+      when '+'
+        new_out << "<ins>#{new_token}</ins>"
+      when '!'
+        old_out << "<del>#{old_token}</del>"
+        new_out << "<ins>#{new_token}</ins>"
+      end
+    end
+    [old_out, new_out]
+  end
+
+  def self.each_change(old_html, new_html)
+    Diff::LCS.sdiff(tokenize(old_html), tokenize(new_html)).each do |change|
+      yield change.action, change.old_element, change.new_element
+    end
+  end
+
+  def self.tokenize(html)
+    html.to_s.scan(TOKEN_REGEXP)
+  end
+end
diff --git a/public/javascripts/cacycle_diff.js b/public/javascripts/cacycle_diff.js
deleted file mode 100644
index 24f9d0b..0000000
--- a/public/javascripts/cacycle_diff.js
+++ /dev/null
@@ -1,1112 +0,0 @@
-// <pre><nowiki>
- 
-/*
- 
-Name:    diff.js
-Version: 0.9.5a (April 6, 2008)
-Info:    http://en.wikipedia.org/wiki/User:Cacycle/diff
-Code:    http://en.wikipedia.org/wiki/User:Cacycle/diff.js
- 
-JavaScript diff algorithm by [[en:User:Cacycle]] (http://en.wikipedia.org/wiki/User_talk:Cacycle).
-Outputs html/css-formatted new text with highlighted deletions, inserts, and block moves.
- 
-The program uses cross-browser code and should work with all modern browsers. It has been tested with:
-* Mozilla Firefox 1.5.0.1
-* Mozilla SeaMonkey 1.0
-* Opera 8.53
-* Internet Explorer 6.0.2900.2180
-* Internet Explorer 7.0.5730.11
-This program is also compatibel with Greasemonkey
- 
-An implementation of the word-based algorithm from:
- 
-Communications of the ACM 21(4):264 (1978)
-http://doi.acm.org/10.1145/359460.359467
- 
-With the following additional feature:
- 
-* Word types have been optimized for MediaWiki source texts
-* Additional post-pass 5 code for resolving islands caused by adding
-  two common words at the end of sequences of common words
-* Additional detection of block borders and color coding of moved blocks and their original position
-* Optional "intelligent" omission of unchanged parts from the output
- 
-This code is used by the MediaWiki in-browser text editors [[en:User:Cacycle/editor]] and [[en:User:Cacycle/wikEd]]
-and the enhanced diff view tool wikEdDiff [[en:User:Cacycle/wikEd]].
- 
-Usage: var htmlText = WDiffString(oldText, newText);
- 
-This code has been released into the public domain.
- 
-Datastructures:
- 
-text: an object that holds all text related datastructures
-  .newWords: consecutive words of the new text (N)
-  .oldWords: consecutive words of the old text (O)
-  .newToOld: array of corresponding word number in old text (NA)
-  .oldToNew: array of corresponding word number in new text (OA)
-  .message:  output message for testing purposes
- 
-symbol['word']: symbol table for passes 1 - 3, holds words as a hash
-  .newCtr:  new word occurences counter (NC)
-  .oldCtr:  old word occurences counter (OC)
-  .toNew:   table last old word number
-  .toOld:   last new word number (OLNA)
- 
-block: an object that holds block move information
-  blocks indexed after new text:
-  .newStart:  new text word number of start of this block
-  .newLength: element number of this block including non-words
-  .newWords:  true word number of this block
-  .newNumber: corresponding block index in old text
-  .newBlock:  moved-block-number of a block that has been moved here
-  .newLeft:   moved-block-number of a block that has been moved from this border leftwards
-  .newRight:  moved-block-number of a block that has been moved from this border rightwards
-  .newLeftIndex:  index number of a block that has been moved from this border leftwards
-  .newRightIndex: index number of a block that has been moved from this border rightwards
-  blocks indexed after old text:
-  .oldStart:  word number of start of this block
-  .oldToNew:  corresponding new text word number of start
-  .oldLength: element number of this block including non-words
-  .oldWords:  true word number of this block
- 
-*/
- 
- 
-// css for change indicators
-if (typeof(wDiffStyleDelete) == 'undefined') { window.wDiffStyleDelete = 'font-weight: normal; text-decoration: none; color: #fff; background-color: #990033;'; }
-if (typeof(wDiffStyleInsert) == 'undefined') { window.wDiffStyleInsert = 'font-weight: normal; text-decoration: none; color: #fff; background-color: #009933;'; }
-if (typeof(wDiffStyleMoved)  == 'undefined') { window.wDiffStyleMoved  = 'font-weight: bold;  color: #000; vertical-align: text-bottom; font-size: xx-small; padding: 0; border: solid 1px;'; }
-if (typeof(wDiffStyleBlock)  == 'undefined') { window.wDiffStyleBlock  = [
-  'color: #000; background-color: #ffff80;',
-  'color: #000; background-color: #c0ffff;',
-  'color: #000; background-color: #ffd0f0;',
-  'color: #000; background-color: #ffe080;',
-  'color: #000; background-color: #aaddff;',
-  'color: #000; background-color: #ddaaff;',
-  'color: #000; background-color: #ffbbbb;',
-  'color: #000; background-color: #d8ffa0;',
-  'color: #000; background-color: #d0d0d0;'
-]; }
- 
-// html for change indicators, {number} is replaced by the block number
-// {block} is replaced by the block style, class and html comments are important for shortening the output
-if (typeof(wDiffHtmlMovedRight)  == 'undefined') { window.wDiffHtmlMovedRight  = '<input class="wDiffHtmlMovedRight" type="button" value="&gt;" style="' + wDiffStyleMoved + ' {block}"><!--wDiffHtmlMovedRight-->'; }
-if (typeof(wDiffHtmlMovedLeft)   == 'undefined') { window.wDiffHtmlMovedLeft   = '<input class="wDiffHtmlMovedLeft" type="button" value="&lt;" style="' + wDiffStyleMoved + ' {block}"><!--wDiffHtmlMovedLeft-->'; }
- 
-if (typeof(wDiffHtmlBlockStart)  == 'undefined') { window.wDiffHtmlBlockStart  = '<span class="wDiffHtmlBlock" style="{block}">'; }
-if (typeof(wDiffHtmlBlockEnd)    == 'undefined') { window.wDiffHtmlBlockEnd    = '</span><!--wDiffHtmlBlock-->'; }
- 
-if (typeof(wDiffHtmlDeleteStart) == 'undefined') { window.wDiffHtmlDeleteStart = '<span class="wDiffHtmlDelete" style="' + wDiffStyleDelete + '">'; }
-if (typeof(wDiffHtmlDeleteEnd)   == 'undefined') { window.wDiffHtmlDeleteEnd   = '</span><!--wDiffHtmlDelete-->'; }
- 
-if (typeof(wDiffHtmlInsertStart) == 'undefined') { window.wDiffHtmlInsertStart = '<span class="wDiffHtmlInsert" style="' + wDiffStyleInsert + '">'; }
-if (typeof(wDiffHtmlInsertEnd)   == 'undefined') { window.wDiffHtmlInsertEnd   = '</span><!--wDiffHtmlInsert-->'; }
- 
-// minimal number of real words for a moved block (0 for always displaying block move indicators)
-if (typeof(wDiffBlockMinLength) == 'undefined') { window.wDiffBlockMinLength = 3; }
- 
-// exclude identical sequence starts and endings from change marking
-if (typeof(wDiffWordDiff) == 'undefined') { window.wDiffWordDiff = true; }
- 
-// enable recursive diff to resolve problematic sequences
-if (typeof(wDiffRecursiveDiff) == 'undefined') { window.wDiffRecursiveDiff = true; }
- 
-// enable block move display
-if (typeof(wDiffShowBlockMoves) == 'undefined') { window.wDiffShowBlockMoves = true; }
- 
-// remove unchanged parts from final output
- 
-// characters before diff tag to search for previous heading, paragraph, line break, cut characters
-if (typeof(wDiffHeadingBefore)   == 'undefined') { window.wDiffHeadingBefore   = 1500; }
-if (typeof(wDiffParagraphBefore) == 'undefined') { window.wDiffParagraphBefore = 1500; }
-if (typeof(wDiffLineBeforeMax)   == 'undefined') { window.wDiffLineBeforeMax   = 1000; }
-if (typeof(wDiffLineBeforeMin)   == 'undefined') { window.wDiffLineBeforeMin   =  500; }
-if (typeof(wDiffBlankBeforeMax)  == 'undefined') { window.wDiffBlankBeforeMax  = 1000; }
-if (typeof(wDiffBlankBeforeMin)  == 'undefined') { window.wDiffBlankBeforeMin  =  500; }
-if (typeof(wDiffCharsBefore)     == 'undefined') { window.wDiffCharsBefore     =  500; }
- 
-// characters after diff tag to search for next heading, paragraph, line break, or characters
-if (typeof(wDiffHeadingAfter)   == 'undefined') { window.wDiffHeadingAfter   = 1500; }
-if (typeof(wDiffParagraphAfter) == 'undefined') { window.wDiffParagraphAfter = 1500; }
-if (typeof(wDiffLineAfterMax)   == 'undefined') { window.wDiffLineAfterMax   = 1000; }
-if (typeof(wDiffLineAfterMin)   == 'undefined') { window.wDiffLineAfterMin   =  500; }
-if (typeof(wDiffBlankAfterMax)  == 'undefined') { window.wDiffBlankAfterMax  = 1000; }
-if (typeof(wDiffBlankAfterMin)  == 'undefined') { window.wDiffBlankAfterMin  =  500; }
-if (typeof(wDiffCharsAfter)     == 'undefined') { window.wDiffCharsAfter     =  500; }
- 
-// maximal fragment distance to join close fragments
-if (typeof(wDiffFragmentJoin)  == 'undefined') { window.wDiffFragmentJoin = 1000; }
-if (typeof(wDiffOmittedChars)  == 'undefined') { window.wDiffOmittedChars = '…'; }
-if (typeof(wDiffOmittedLines)  == 'undefined') { window.wDiffOmittedLines = '<hr style="height: 2px; margin: 1em 10%;">'; }
-if (typeof(wDiffNoChange)      == 'undefined') { window.wDiffNoChange     = '<hr style="height: 2px; margin: 1em 20%;">'; }
- 
-// compatibility fix for old name of main function
-window.StringDiff = window.WDiffString;
- 
- 
-// WDiffString: main program
-// input: oldText, newText, strings containing the texts
-// returns: html diff
- 
-window.WDiffString = function(oldText, newText) {
- 
-// IE / Mac fix
-  oldText = oldText.replace(/(\r\n)/g, '\n');
-  newText = newText.replace(/(\r\n)/g, '\n');
- 
-  var text = {};
-  text.newWords = [];
-  text.oldWords = [];
-  text.newToOld = [];
-  text.oldToNew = [];
-  text.message = '';
-  var block = {};
-  var outText = '';
- 
-// trap trivial changes: no change
-  if (oldText == newText) {
-    outText = newText;
-    outText = WDiffEscape(outText);
-    outText = WDiffHtmlFormat(outText);
-    return(outText);
-  }
- 
-// trap trivial changes: old text deleted
-  if ( (oldText == null) || (oldText.length == 0) ) {
-    outText = newText;
-    outText = WDiffEscape(outText);
-    outText = WDiffHtmlFormat(outText);
-    outText = wDiffHtmlInsertStart + outText + wDiffHtmlInsertEnd;
-    return(outText);
-  }
- 
-// trap trivial changes: new text deleted
-  if ( (newText == null) || (newText.length == 0) ) {
-    outText = oldText;
-    outText = WDiffEscape(outText);
-    outText = WDiffHtmlFormat(outText);
-    outText = wDiffHtmlDeleteStart + outText + wDiffHtmlDeleteEnd;
-    return(outText);
-  }
- 
-// split new and old text into words
-  WDiffSplitText(oldText, newText, text);
- 
-// calculate diff information
-  WDiffText(text);
- 
-//detect block borders and moved blocks
-  WDiffDetectBlocks(text, block);
- 
-// process diff data into formatted html text
-  outText = WDiffToHtml(text, block);
- 
-// IE fix
-  outText = outText.replace(/> ( *)</g, '>&nbsp;$1<');
- 
-  return(outText);
-}
- 
- 
-// WDiffSplitText: split new and old text into words
-// input: oldText, newText, strings containing the texts
-// changes: text.newWords and text.oldWords, arrays containing the texts in arrays of words
- 
-window.WDiffSplitText = function(oldText, newText, text) {
- 
-// convert strange spaces
-  oldText = oldText.replace(/[\t\u000b\u00a0\u2028\u2029]+/g, ' ');
-  newText = newText.replace(/[\t\u000b\u00a0\u2028\u2029]+/g, ' ');
- 
-// split old text into words
- 
-//              /     |    |    |    |    |   |  |     |   |  |  |    |    |    | /
-  var pattern = /[\w]+|\[\[|\]\]|\{\{|\}\}|\n+| +|&\w+;|'''|''|=+|\{\||\|\}|\|\-|./g;
-  var result;
-  do {
-    result = pattern.exec(oldText);
-    if (result != null) {
-      text.oldWords.push(result[0]);
-    }
-  } while (result != null);
- 
-// split new text into words
-  do {
-    result = pattern.exec(newText);
-    if (result != null) {
-      text.newWords.push(result[0]);
-    }
-  } while (result != null);
- 
-  return;
-}
- 
- 
-// WDiffText: calculate diff information
-// input: text.newWords and text.oldWords, arrays containing the texts in arrays of words
-// optionally for recursive calls: newStart, newEnd, oldStart, oldEnd, recursionLevel
-// changes: text.newToOld and text.oldToNew, containing the line numbers in the other version
- 
-window.WDiffText = function(text, newStart, newEnd, oldStart, oldEnd, recursionLevel) {
- 
-  symbol = new Object();
-  symbol.newCtr = [];
-  symbol.oldCtr = [];
-  symbol.toNew = [];
-  symbol.toOld = [];
- 
-// set defaults
-  newStart = newStart || 0;
-  newEnd = newEnd || text.newWords.length;
-  oldStart = oldStart || 0;
-  oldEnd = oldEnd || text.oldWords.length;
-  recursionLevel = recursionLevel || 0;
- 
-// limit recursion depth
-  if (recursionLevel > 10) {
-    return;
-  }
- 
-// pass 1: parse new text into symbol table s
- 
-  var word;
-  for (var i = newStart; i < newEnd; i ++) {
-    word = text.newWords[i];
- 
-// add new entry to symbol table
-    if ( symbol[word] == null) {
-      symbol[word] = { newCtr: 0, oldCtr: 0, toNew: null, toOld: null };
-    }
- 
-// increment symbol table word counter for new text
-    symbol[word].newCtr ++;
- 
-// add last word number in new text
-    symbol[word].toNew = i;
-  }
- 
-// pass 2: parse old text into symbol table
- 
-  for (var j = oldStart; j < oldEnd; j ++) {
-    word = text.oldWords[j];
- 
-// add new entry to symbol table
-    if ( symbol[word] == null) {
-      symbol[word] = { newCtr: 0, oldCtr: 0, toNew: null, toOld: null };
-    }
- 
-// increment symbol table word counter for old text
-    symbol[word].oldCtr ++;
- 
-// add last word number in old text
-    symbol[word].toOld = j;
-  }
- 
-// pass 3: connect unique words
- 
-  for (var i in symbol) {
- 
-// find words in the symbol table that occur only once in both versions
-    if ( (symbol[i].newCtr == 1) && (symbol[i].oldCtr == 1) ) {
-      var toNew = symbol[i].toNew;
-      var toOld = symbol[i].toOld;
- 
-// do not use spaces as unique markers
-      if ( ! /\s/.test( text.newWords[toNew] ) ) {
- 
-// connect from new to old and from old to new
-        text.newToOld[toNew] = toOld;
-        text.oldToNew[toOld] = toNew;
-      }
-    }
-  }
- 
-// pass 4: connect adjacent identical words downwards
- 
-  for (var i = newStart; i < newEnd - 1; i ++) {
- 
-// find already connected pairs
-    if (text.newToOld[i] != null) {
-      j = text.newToOld[i];
- 
-// check if the following words are not yet connected
-      if ( (text.newToOld[i + 1] == null) && (text.oldToNew[j + 1] == null) ) {
- 
-// if the following words are the same connect them
-        if ( text.newWords[i + 1] == text.oldWords[j + 1] ) {
-          text.newToOld[i + 1] = j + 1;
-          text.oldToNew[j + 1] = i + 1;
-        }
-      }
-    }
-  }
- 
-// pass 5: connect adjacent identical words upwards
- 
-  for (var i = newEnd - 1; i > newStart; i --) {
- 
-// find already connected pairs
-    if (text.newToOld[i] != null) {
-      j = text.newToOld[i];
- 
-// check if the preceeding words are not yet connected
-      if ( (text.newToOld[i - 1] == null) && (text.oldToNew[j - 1] == null) ) {
- 
-// if the preceeding words are the same connect them
-        if ( text.newWords[i - 1] == text.oldWords[j - 1] ) {
-          text.newToOld[i - 1] = j - 1;
-          text.oldToNew[j - 1] = i - 1;
-        }
-      }
-    }
-  }
- 
-// recursively diff still unresolved regions downwards
- 
-  if (wDiffRecursiveDiff) {
-    i = newStart;
-    j = oldStart;
-    while (i < newEnd) {
-      if (text.newToOld[i - 1] != null) {
-        j = text.newToOld[i - 1] + 1;
-      }
- 
-// check for the start of an unresolved sequence
-      if ( (text.newToOld[i] == null) && (text.oldToNew[j] == null) ) {
- 
-// determine the ends of the sequences
-        var iStart = i;
-        var iEnd = i;
-        while ( (text.newToOld[iEnd] == null) && (iEnd < newEnd) ) {
-          iEnd ++;
-        }
-        var iLength = iEnd - iStart;
- 
-        var jStart = j;
-        var jEnd = j;
-        while ( (text.oldToNew[jEnd] == null) && (jEnd < oldEnd) ) {
-          jEnd ++;
-        }
-        var jLength = jEnd - jStart;
- 
-// recursively diff the unresolved sequence
-        if ( (iLength > 0) && (jLength > 0) ) {
-          if ( (iLength > 1) || (jLength > 1) ) {
-            if ( (iStart != newStart) || (iEnd != newEnd) || (jStart != oldStart) || (jEnd != oldEnd) ) {
-              WDiffText(text, iStart, iEnd, jStart, jEnd, recursionLevel + 1);
-            }
-          }
-        }
-        i = iEnd;
-      }
-      else {
-        i ++;
-      }
-    }
-  }
- 
-// recursively diff still unresolved regions upwards
- 
-  if (wDiffRecursiveDiff) {
-    i = newEnd - 1;
-    j = oldEnd - 1;
-    while (i >= newStart) {
-      if (text.newToOld[i + 1] != null) {
-        j = text.newToOld[i + 1] - 1;
-      }
- 
-// check for the start of an unresolved sequence
-      if ( (text.newToOld[i] == null) && (text.oldToNew[j] == null) ) {
- 
-// determine the ends of the sequences
-        var iStart = i;
-        var iEnd = i + 1;
-        while ( (text.newToOld[iStart - 1] == null) && (iStart >= newStart) ) {
-          iStart --;
-        }
-        var iLength = iEnd - iStart;
- 
-        var jStart = j;
-        var jEnd = j + 1;
-        while ( (text.oldToNew[jStart - 1] == null) && (jStart >= oldStart) ) {
-          jStart --;
-        }
-        var jLength = jEnd - jStart;
- 
-// recursively diff the unresolved sequence
-        if ( (iLength > 0) && (jLength > 0) ) {
-          if ( (iLength > 1) || (jLength > 1) ) {
-            if ( (iStart != newStart) || (iEnd != newEnd) || (jStart != oldStart) || (jEnd != oldEnd) ) {
-              WDiffText(text, iStart, iEnd, jStart, jEnd, recursionLevel + 1);
-            }
-          }
-        }
-        i = iStart - 1;
-      }
-      else {
-        i --;
-      }
-    }
-  }
-  return;
-}
- 
- 
-// WDiffToHtml: process diff data into formatted html text
-// input: text.newWords and text.oldWords, arrays containing the texts in arrays of words
-//   text.newToOld and text.oldToNew, containing the line numbers in the other version
-//   block data structure
-// returns: outText, a html string
- 
-window.WDiffToHtml = function(text, block) {
- 
-  var outText = text.message;
- 
-  var blockNumber = 0;
-  var i = 0;
-  var j = 0;
-  var movedAsInsertion;
- 
-// cycle through the new text
-  do {
-    var movedIndex = [];
-    var movedBlock = [];
-    var movedLeft = [];
-    var blockText = '';
-    var identText = '';
-    var delText = '';
-    var insText = '';
-    var identStart = '';
- 
-// check if a block ends here and finish previous block
-    if (movedAsInsertion != null) {
-      if (movedAsInsertion == false) {
-        identStart += wDiffHtmlBlockEnd;
-      }
-      else {
-        identStart += wDiffHtmlInsertEnd;
-      }
-      movedAsInsertion = null;
-    }
- 
-// detect block boundary
-    if ( (text.newToOld[i] != j) || (blockNumber == 0 ) ) {
-      if ( ( (text.newToOld[i] != null) || (i >= text.newWords.length) ) && ( (text.oldToNew[j] != null) || (j >= text.oldWords.length) ) ) {
- 
-// block moved right
-        var moved = block.newRight[blockNumber];
-        if (moved > 0) {
-          var index = block.newRightIndex[blockNumber];
-          movedIndex.push(index);
-          movedBlock.push(moved);
-          movedLeft.push(false);
-        }
- 
-// block moved left
-        moved = block.newLeft[blockNumber];
-        if (moved > 0) {
-          var index = block.newLeftIndex[blockNumber];
-          movedIndex.push(index);
-          movedBlock.push(moved);
-          movedLeft.push(true);
-        }
- 
-// check if a block starts here
-        moved = block.newBlock[blockNumber];
-        if (moved > 0) {
- 
-// mark block as inserted text
-          if (block.newWords[blockNumber] < wDiffBlockMinLength) {
-            identStart += wDiffHtmlInsertStart;
-            movedAsInsertion = true;
-          }
- 
-// mark block by color
-          else {
-            if (moved > wDiffStyleBlock.length) {
-              moved = wDiffStyleBlock.length;
-            }
-            identStart += WDiffHtmlCustomize(wDiffHtmlBlockStart, moved - 1);
-            movedAsInsertion = false;
-          }
-        }
- 
-        if (i >= text.newWords.length) {
-          i ++;
-        }
-        else {
-          j = text.newToOld[i];
-          blockNumber ++;
-        }
-      }
-    }
- 
-// get the correct order if moved to the left as well as to the right from here
-    if (movedIndex.length == 2) {
-      if (movedIndex[0] > movedIndex[1]) {
-        movedIndex.reverse();
-        movedBlock.reverse();
-        movedLeft.reverse();
-      }
-    }
- 
-// handle left and right block moves from this position
-    for (var m = 0; m < movedIndex.length; m ++) {
- 
-// insert the block as deleted text
-      if (block.newWords[ movedIndex[m] ] < wDiffBlockMinLength) {
-        var movedStart = block.newStart[ movedIndex[m] ];
-        var movedLength = block.newLength[ movedIndex[m] ];
-        var str = '';
-        for (var n = movedStart; n < movedStart + movedLength; n ++) {
-          str += text.newWords[n];
-        }
-        str = WDiffEscape(str);
-        str = str.replace(/\n/g, '&para;<br>');
-        blockText += wDiffHtmlDeleteStart + str + wDiffHtmlDeleteEnd;
-      }
- 
-// add a placeholder / move direction indicator
-      else {
-        if (movedBlock[m] > wDiffStyleBlock.length) {
-          movedBlock[m] = wDiffStyleBlock.length;
-        }
-        if (movedLeft[m]) {
-          blockText += WDiffHtmlCustomize(wDiffHtmlMovedLeft, movedBlock[m] - 1);
-        }
-        else {
-          blockText += WDiffHtmlCustomize(wDiffHtmlMovedRight, movedBlock[m] - 1);
-        }
-      }
-    }
- 
-// collect consecutive identical text
-    while ( (i < text.newWords.length) && (j < text.oldWords.length) ) {
-      if ( (text.newToOld[i] == null) || (text.oldToNew[j] == null) ) {
-        break;
-      }
-      if (text.newToOld[i] != j) {
-        break;
-      }
-      identText += text.newWords[i];
-      i ++;
-      j ++;
-    }
- 
-// collect consecutive deletions
-    while ( (text.oldToNew[j] == null) && (j < text.oldWords.length) ) {
-      delText += text.oldWords[j];
-      j ++;
-    }
- 
-// collect consecutive inserts
-    while ( (text.newToOld[i] == null) && (i < text.newWords.length) ) {
-      insText += text.newWords[i];
-      i ++;
-    }
- 
-// remove leading and trailing similarities betweein delText and ins from highlighting
-    var preText = '';
-    var postText = '';
-    if (wDiffWordDiff) {
-      if ( (delText != '') && (insText != '') ) {
- 
-// remove leading similarities
-        while ( delText.charAt(0) == insText.charAt(0) && (delText != '') && (insText != '') ) {
-          preText = preText + delText.charAt(0);
-          delText = delText.substr(1);
-          insText = insText.substr(1);
-        }
- 
-// remove trailing similarities
-        while ( delText.charAt(delText.length - 1) == insText.charAt(insText.length - 1) && (delText != '') && (insText != '') ) {
-          postText = delText.charAt(delText.length - 1) + postText;
-          delText = delText.substr(0, delText.length - 1);
-          insText = insText.substr(0, insText.length - 1);
-        }
-      }
-    }
- 
-// output the identical text, deletions and inserts
- 
-// moved from here indicator
-    if (blockText != '') {
-      outText += blockText;
-    }
- 
-// identical text
-    if (identText != '') {
-      outText += identStart + WDiffEscape(identText);
-    }
-    outText += preText;
- 
-// deleted text
-    if (delText != '') {
-      delText = wDiffHtmlDeleteStart + WDiffEscape(delText) + wDiffHtmlDeleteEnd;
-      delText = delText.replace(/\n/g, '&para;<br>');
-      outText += delText;
-    }
- 
-// inserted text
-    if (insText != '') {
-      insText = wDiffHtmlInsertStart + WDiffEscape(insText) + wDiffHtmlInsertEnd;
-      insText = insText.replace(/\n/g, '&para;<br>');
-      outText += insText;
-    }
-    outText += postText;
-  } while (i <= text.newWords.length);
- 
-  outText += '\n';
-  outText = WDiffHtmlFormat(outText);
- 
-  return(outText);
-}
- 
- 
-// WDiffEscape: replaces html-sensitive characters in output text with character entities
- 
-window.WDiffEscape = function(text) {
- 
-  text = text.replace(/&/g, '&amp;');
-  text = text.replace(/</g, '&lt;');
-  text = text.replace(/>/g, '&gt;');
-  text = text.replace(/\"/g, '&quot;');
- 
-  return(text);
-}
- 
- 
-// HtmlCustomize: customize indicator html: replace {number} with the block number, {block} with the block style
- 
-window.WDiffHtmlCustomize = function(text, block) {
- 
-  text = text.replace(/\{number\}/, block);
-  text = text.replace(/\{block\}/, wDiffStyleBlock[block]);
- 
-  return(text);
-}
- 
- 
-// HtmlFormat: replaces newlines and multiple spaces in text with html code
- 
-window.WDiffHtmlFormat = function(text) {
- 
-  text = text.replace(/  /g, ' &nbsp;');
-  text = text.replace(/\n/g, '<br>');
- 
-  return(text);
-}
- 
- 
-// WDiffDetectBlocks: detect block borders and moved blocks
-// input: text object, block object
- 
-window.WDiffDetectBlocks = function(text, block) {
- 
-  block.oldStart  = [];
-  block.oldToNew  = [];
-  block.oldLength = [];
-  block.oldWords  = [];
-  block.newStart  = [];
-  block.newLength = [];
-  block.newWords  = [];
-  block.newNumber = [];
-  block.newBlock  = [];
-  block.newLeft   = [];
-  block.newRight  = [];
-  block.newLeftIndex  = [];
-  block.newRightIndex = [];
- 
-  var blockNumber = 0;
-  var wordCounter = 0;
-  var realWordCounter = 0;
- 
-// get old text block order
-  if (wDiffShowBlockMoves) {
-    var j = 0;
-    var i = 0;
-    do {
- 
-// detect block boundaries on old text
-      if ( (text.oldToNew[j] != i) || (blockNumber == 0 ) ) {
-        if ( ( (text.oldToNew[j] != null) || (j >= text.oldWords.length) ) && ( (text.newToOld[i] != null) || (i >= text.newWords.length) ) ) {
-          if (blockNumber > 0) {
-            block.oldLength[blockNumber - 1] = wordCounter;
-            block.oldWords[blockNumber - 1] = realWordCounter;
-            wordCounter = 0;
-            realWordCounter = 0;
-          }
- 
-          if (j >= text.oldWords.length) {
-            j ++;
-          }
-          else {
-            i = text.oldToNew[j];
-            block.oldStart[blockNumber] = j;
-            block.oldToNew[blockNumber] = text.oldToNew[j];
-            blockNumber ++;
-          }
-        }
-      }
- 
-// jump over identical pairs
-      while ( (i < text.newWords.length) && (j < text.oldWords.length) ) {
-        if ( (text.newToOld[i] == null) || (text.oldToNew[j] == null) ) {
-          break;
-        }
-        if (text.oldToNew[j] != i) {
-          break;
-        }
-        i ++;
-        j ++;
-        wordCounter ++;
-        if ( /\w/.test( text.newWords[i] ) ) {
-          realWordCounter ++;
-        }
-      }
- 
-// jump over consecutive deletions
-      while ( (text.oldToNew[j] == null) && (j < text.oldWords.length) ) {
-        j ++;
-      }
- 
-// jump over consecutive inserts
-      while ( (text.newToOld[i] == null) && (i < text.newWords.length) ) {
-        i ++;
-      }
-    } while (j <= text.oldWords.length);
- 
-// get the block order in the new text
-    var lastMin;
-    var currMinIndex;
-    lastMin = null;
- 
-// sort the data by increasing start numbers into new text block info
-    for (var i = 0; i < blockNumber; i ++) {
-      currMin = null;
-      for (var j = 0; j < blockNumber; j ++) {
-        curr = block.oldToNew[j];
-        if ( (curr > lastMin) || (lastMin == null) ) {
-          if ( (curr < currMin) || (currMin == null) ) {
-            currMin = curr;
-            currMinIndex = j;
-          }
-        }
-      }
-      block.newStart[i] = block.oldToNew[currMinIndex];
-      block.newLength[i] = block.oldLength[currMinIndex];
-      block.newWords[i] = block.oldWords[currMinIndex];
-      block.newNumber[i] = currMinIndex;
-      lastMin = currMin;
-    }
- 
-// detect not moved blocks
-    for (var i = 0; i < blockNumber; i ++) {
-      if (block.newBlock[i] == null) {
-        if (block.newNumber[i] == i) {
-          block.newBlock[i] = 0;
-        }
-      }
-    }
- 
-// detect switches of neighbouring blocks
-    for (var i = 0; i < blockNumber - 1; i ++) {
-      if ( (block.newBlock[i] == null) && (block.newBlock[i + 1] == null) ) {
-        if (block.newNumber[i] - block.newNumber[i + 1] == 1) {
-          if ( (block.newNumber[i + 1] - block.newNumber[i + 2] != 1) || (i + 2 >= blockNumber) ) {
- 
-// the shorter one is declared the moved one
-            if (block.newLength[i] < block.newLength[i + 1]) {
-              block.newBlock[i] = 1;
-              block.newBlock[i + 1] = 0;
-            }
-            else {
-              block.newBlock[i] = 0;
-              block.newBlock[i + 1] = 1;
-            }
-          }
-        }
-      }
-    }
- 
-// mark all others as moved and number the moved blocks
-    j = 1;
-    for (var i = 0; i < blockNumber; i ++) {
-      if ( (block.newBlock[i] == null) || (block.newBlock[i] == 1) ) {
-        block.newBlock[i] = j++;
-      }
-    }
- 
-// check if a block has been moved from this block border
-    for (var i = 0; i < blockNumber; i ++) {
-      for (var j = 0; j < blockNumber; j ++) {
- 
-        if (block.newNumber[j] == i) {
-          if (block.newBlock[j] > 0) {
- 
-// block moved right
-            if (block.newNumber[j] < j) {
-              block.newRight[i] = block.newBlock[j];
-              block.newRightIndex[i] = j;
-            }
- 
-// block moved left
-            else {
-              block.newLeft[i + 1] = block.newBlock[j];
-              block.newLeftIndex[i + 1] = j;
-            }
-          }
-        }
-      }
-    }
-  }
-  return;
-}
- 
- 
-// WDiffShortenOutput: remove unchanged parts from final output
-// input: the output of WDiffString
-// returns: the text with removed unchanged passages indicated by (...)
- 
-window.WDiffShortenOutput = function(diffText) {
- 
-// html <br/> to newlines
-  diffText = diffText.replace(/<br[^>]*>/g, '\n');
- 
-// scan for diff html tags
-  var regExpDiff = new RegExp('<\\w+ class=\\"(\\w+)\\"[^>]*>(.|\\n)*?<!--\\1-->', 'g');
-  var tagStart = [];
-  var tagEnd = [];
-  var i = 0;
-  var found;
-  while ( (found = regExpDiff.exec(diffText)) != null ) {
- 
-// combine consecutive diff tags
-    if ( (i > 0) && (tagEnd[i - 1] == found.index) ) {
-      tagEnd[i - 1] = found.index + found[0].length;
-    }
-    else {
-      tagStart[i] = found.index;
-      tagEnd[i] = found.index + found[0].length;
-      i ++;
-    }
-  }
- 
-// no diff tags detected
-  if (tagStart.length == 0) {
-    return(wDiffNoChange);
-  }
- 
-// define regexps
-  var regExpHeading = new RegExp('\\n=+.+?=+ *\\n|\\n\\{\\||\\n\\|\\}', 'g');
-  var regExpParagraph = new RegExp('\\n\\n+', 'g');
-  var regExpLine = new RegExp('\\n+', 'g');
-  var regExpBlank = new RegExp('(<[^>]+>)*\\s+', 'g');
- 
-// determine fragment border positions around diff tags
-  var rangeStart = [];
-  var rangeEnd = [];
-  var rangeStartType = [];
-  var rangeEndType = [];
-  for (var i = 0; i < tagStart.length; i ++) {
-    var found;
- 
-// find last heading before diff tag
-    var lastPos = tagStart[i] - wDiffHeadingBefore;
-    if (lastPos < 0) {
-      lastPos = 0;
-    }
-    regExpHeading.lastIndex = lastPos;
-    while ( (found = regExpHeading.exec(diffText)) != null ) {
-      if (found.index > tagStart[i]) {
-        break;
-      }
-      rangeStart[i] = found.index;
-      rangeStartType[i] = 'heading';
-    }
- 
-// find last paragraph before diff tag
-    if (rangeStart[i] == null) {
-      lastPos = tagStart[i] - wDiffParagraphBefore;
-      if (lastPos < 0) {
-        lastPos = 0;
-      }
-      regExpParagraph.lastIndex = lastPos;
-      while ( (found = regExpParagraph.exec(diffText)) != null ) {
-        if (found.index > tagStart[i]) {
-          break;
-        }
-        rangeStart[i] = found.index;
-        rangeStartType[i] = 'paragraph';
-      }
-    }
- 
-// find line break before diff tag
-    if (rangeStart[i] == null) {
-      lastPos = tagStart[i] - wDiffLineBeforeMax;
-      if (lastPos < 0) {
-        lastPos = 0;
-      }
-      regExpLine.lastIndex = lastPos;
-      while ( (found = regExpLine.exec(diffText)) != null ) {
-        if (found.index > tagStart[i] - wDiffLineBeforeMin) {
-          break;
-        }
-        rangeStart[i] = found.index;
-        rangeStartType[i] = 'line';
-      }
-    }
- 
-// find blank before diff tag
-    if (rangeStart[i] == null) {
-      lastPos = tagStart[i] - wDiffBlankBeforeMax;
-      if (lastPos < 0) {
-        lastPos = 0;
-      }
-      regExpBlank.lastIndex = lastPos;
-      while ( (found = regExpBlank.exec(diffText)) != null ) {
-        if (found.index > tagStart[i] - wDiffBlankBeforeMin) {
-          break;
-        }
-        rangeStart[i] = found.index;
-        rangeStartType[i] = 'blank';
-      }
-    }
- 
-// fixed number of chars before diff tag
-    if (rangeStart[i] == null) {
-      rangeStart[i] = tagStart[i] - wDiffCharsBefore;
-      rangeStartType[i] = 'chars';
-      if (rangeStart[i] < 0) {
-        rangeStart[i] = 0;
-      }
-    }
- 
-// find first heading after diff tag
-    regExpHeading.lastIndex = tagEnd[i];
-    if ( (found = regExpHeading.exec(diffText)) != null ) {
-      if (found.index < tagEnd[i] + wDiffHeadingAfter) {
-        rangeEnd[i] = found.index + found[0].length;
-        rangeEndType[i] = 'heading';
-      }
-    }
- 
-// find first paragraph after diff tag
-    if (rangeEnd[i] == null) {
-      regExpParagraph.lastIndex = tagEnd[i];
-      if ( (found = regExpParagraph.exec(diffText)) != null ) {
-        if (found.index < tagEnd[i] + wDiffParagraphAfter) {
-          rangeEnd[i] = found.index;
-          rangeEndType[i] = 'paragraph';
-        }
-      }
-    }
- 
-// find first line break after diff tag
-    if (rangeEnd[i] == null) {
-      regExpLine.lastIndex = tagEnd[i] + wDiffLineAfterMin;
-      if ( (found = regExpLine.exec(diffText)) != null ) {
-        if (found.index < tagEnd[i] + wDiffLineAfterMax) {
-          rangeEnd[i] = found.index;
-          rangeEndType[i] = 'break';
-        }
-      }
-    }
- 
-// find blank after diff tag
-    if (rangeEnd[i] == null) {
-      regExpBlank.lastIndex = tagEnd[i] + wDiffBlankAfterMin;
-      if ( (found = regExpBlank.exec(diffText)) != null ) {
-        if (found.index < tagEnd[i] + wDiffBlankAfterMax) {
-          rangeEnd[i] = found.index;
-          rangeEndType[i] = 'blank';
-        }
-      }
-    }
- 
-// fixed number of chars after diff tag
-    if (rangeEnd[i] == null) {
-      rangeEnd[i] = tagEnd[i] + wDiffCharsAfter;
-      if (rangeEnd[i] > diffText.length) {
-        rangeEnd[i] = diffText.length;
-        rangeEndType[i] = 'chars';
-      }
-    }
-  }
- 
-// remove overlaps, join close fragments
-  var fragmentStart = [];
-  var fragmentEnd = [];
-  var fragmentStartType = [];
-  var fragmentEndType = [];
-  fragmentStart[0] = rangeStart[0];
-  fragmentEnd[0] = rangeEnd[0];
-  fragmentStartType[0] = rangeStartType[0];
-  fragmentEndType[0] = rangeEndType[0];
-  var j = 1;
-  for (var i = 1; i < rangeStart.length; i ++) {
-    if (rangeStart[i] > fragmentEnd[j - 1] + wDiffFragmentJoin) {
-      fragmentStart[j] = rangeStart[i];
-      fragmentEnd[j] = rangeEnd[i];
-      fragmentStartType[j] = rangeStartType[i];
-      fragmentEndType[j] = rangeEndType[i];
-      j ++;
-    }
-    else {
-      fragmentEnd[j - 1] = rangeEnd[i];
-      fragmentEndType[j - 1] = rangeEndType[i];
-    }
-  }
- 
-// assemble the fragments
-  var outText = '';
-  for (var i = 0; i < fragmentStart.length; i ++) {
- 
-// get text fragment
-    var fragment = diffText.substring(fragmentStart[i], fragmentEnd[i]);
-    var fragment = fragment.replace(/^\n+|\n+$/g, '');
- 
-// add inline marks for omitted chars and words
-    if (fragmentStart[i] > 0) {
-      if (fragmentStartType[i] == 'chars') {
-        fragment = wDiffOmittedChars + fragment;
-      }
-      else if (fragmentStartType[i] == 'blank') {
-        fragment = wDiffOmittedChars + ' ' + fragment;
-      }
-    }
-    if (fragmentEnd[i] < diffText.length) {
-      if (fragmentStartType[i] == 'chars') {
-        fragment = fragment + wDiffOmittedChars;
-      }
-      else if (fragmentStartType[i] == 'blank') {
-        fragment = fragment + ' ' + wDiffOmittedChars;
-      }
-    }
- 
-// add omitted line separator
-    if (fragmentStart[i] > 0) {
-      outText += wDiffOmittedLines;
-    }
- 
-// encapsulate span errors
-    outText += '<div>' + fragment + '</div>';
-  }
- 
-// add trailing omitted line separator
-  if (fragmentEnd[i - 1] < diffText.length) {
-    outText = outText + wDiffOmittedLines;
-  }
- 
-// remove leading and trailing empty lines
-  outText = outText.replace(/^(<div>)\n+|\n+(<\/div>)$/g, '$1$2');
- 
-// convert to html linebreaks
-  outText = outText.replace(/\n/g, '<br />');
- 
-  return(outText);
-}
- 
- 
-// <pre><nowiki>
\ No newline at end of file
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 38c9e5a..1bb6cf4 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -511,6 +511,31 @@ table.revisions_table tr:hover {
   background-color: #f1f1f1;
 }
 
+#diffview del {
+  background: #ffd7d5;
+  color: #82071e;
+  text-decoration: line-through;
+  padding: 0 2px;
+  border-radius: 2px;
+}
+
+#diffview ins {
+  background: #ccffd8;
+  color: #055d20;
+  text-decoration: none;
+  padding: 0 2px;
+  border-radius: 2px;
+}
+
+#diffview .diff_side_by_side {
+  display: flex;
+  gap: 1rem;
+}
+
+#diffview .diff_column {
+  flex: 1;
+}
+
 table.user_table td.user_login {
   padding-right: 30px;
 }
diff --git a/test/controllers/revisions_controller_test.rb b/test/controllers/revisions_controller_test.rb
index b4dcd8f..e2fc976 100644
--- a/test/controllers/revisions_controller_test.rb
+++ b/test/controllers/revisions_controller_test.rb
@@ -59,4 +59,33 @@ class RevisionsControllerTest < ActionController::TestCase
     assert_equal @node.head, @node.pages.first
     assert_equal "first", @node.head.reload.body
   end
+
+  test "diffing two revisions renders real markup with only the changed words marked" do
+    login_as :quentin
+    post(
+      :diff, params: {
+        :node_id => @node.id,
+        :start_revision => @node.pages.first.revision,
+        :end_revision => @node.pages.last.revision
+      }
+    )
+    assert_response :success
+    assert_select "del", "first"
+    assert_select "ins", "second"
+    assert_no_match /&lt;/, response.body
+  end
+
+  test "diffing two revisions in side by side view renders two columns" do
+    login_as :quentin
+    post(
+      :diff, params: {
+        :node_id => @node.id,
+        :start_revision => @node.pages.first.revision,
+        :end_revision => @node.pages.last.revision,
+        :view => "side_by_side"
+      }
+    )
+    assert_response :success
+    assert_select ".diff_column", 2
+  end
 end
diff --git a/test/models/page_test.rb b/test/models/page_test.rb
index ad2742f..ac5691a 100644
--- a/test/models/page_test.rb
+++ b/test/models/page_test.rb
@@ -176,4 +176,38 @@ class PageTest < ActiveSupport::TestCase
     assert_not_equal first_page.id, first_page.node.head_id
     assert first_page.published_at.present?
   end
+
+  def test_diff_against_inline_keeps_tags_and_marks_only_the_changed_word
+    n = Node.root.children.create! :slug => "diff_against_test"
+    d = n.find_or_create_draft @user1
+    d.title = "Old heading"
+    d.save!
+    n.publish_draft!
+
+    d2 = n.find_or_create_draft @user1
+    d2.title = "New heading"
+    d2.save!
+
+    diff = d2.diff_against(n.head)
+
+    assert_match "<del>Old</del>", diff[:title]
+    assert_match "<ins>New</ins>", diff[:title]
+  end
+
+  def test_diff_against_side_by_side_returns_two_annotated_strings
+    n = Node.root.children.create! :slug => "diff_against_sbs_test"
+    d = n.find_or_create_draft @user1
+    d.title = "Old heading"
+    d.save!
+    n.publish_draft!
+
+    d2 = n.find_or_create_draft @user1
+    d2.title = "New heading"
+    d2.save!
+
+    old_html, new_html = d2.diff_against(n.head, view: :side_by_side)[:title]
+
+    assert_match "<del>Old</del>", old_html
+    assert_match "<ins>New</ins>", new_html
+  end
 end
-- 
cgit v1.3


From cdf861a23233afb955b3c722a73d9e6ac8de3942 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 10 Jul 2026 00:44:22 +0200
Subject: Fix stale assertions and escaped body in revisions#show
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The table-based markup revisions#show's own test was asserting
against (<strong>, <td>) was retired when this view moved to the
node_description/node_content pattern; updated the assertions to
match. Found in the same pass: @page.body had no raw(), so any real
markup in a revision's body rendered as escaped entities on this
page — same bug class as revisions#diff, just not yet fixed here.
---
 app/views/revisions/show.html.erb             |  2 +-
 test/controllers/revisions_controller_test.rb | 24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/app/views/revisions/show.html.erb b/app/views/revisions/show.html.erb
index 4148096..92d959b 100644
--- a/app/views/revisions/show.html.erb
+++ b/app/views/revisions/show.html.erb
@@ -33,6 +33,6 @@
     <div class="node_content"><%= @page.abstract %></div>
 
     <div class="node_description">Body</div>
-    <div class="node_content"><%= @page.body %></div>
+    <div class="node_content"><%= raw @page.body %></div>
   </div>
 </div>
diff --git a/test/controllers/revisions_controller_test.rb b/test/controllers/revisions_controller_test.rb
index e2fc976..46fc220 100644
--- a/test/controllers/revisions_controller_test.rb
+++ b/test/controllers/revisions_controller_test.rb
@@ -28,21 +28,33 @@ class RevisionsControllerTest < ActionController::TestCase
     assert_response :success
     assert_select ".revision", 2
   end
-  
-  test "showing one revision" do
+
+   test "showing one revision" do
     login_as :quentin
     get :show, params: { :node_id => @node.id, :id => @node.pages.last.id }
     assert_response :success
-    assert_select "strong", "Body"
-    assert_select "td", {:count => 1, :text => "second"}
+    assert_select ".node_description", "Body"
+    assert_select ".node_content", {:count => 1, :text => "second"}
   end
-  
+
+  test "showing a revision renders real markup in the body, not escaped entities" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "show_markup_test")
+    draft = node.draft
+    draft.body = "<h3>Hello</h3>"
+    node.publish_draft!
+
+    get :show, params: { :node_id => node.id, :id => node.head.id }
+    assert_response :success
+    assert_select ".node_content h3", "Hello"
+  end
+
   test "diffing two revisions" do
     login_as :quentin
     post(
       :diff, params: {
         :node_id => @node.id,
-        :start_revision => @node.pages.first.revision, 
+        :start_revision => @node.pages.first.revision,
         :end_revision => @node.pages.last.revision
       }
     )
-- 
cgit v1.3


From 81769557804ce59ce3e4603e8f47e731b61b180d Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 10 Jul 2026 00:44:41 +0200
Subject: Whitespace fixes

---
 test/controllers/revisions_controller_test.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/test/controllers/revisions_controller_test.rb b/test/controllers/revisions_controller_test.rb
index 46fc220..caca6bf 100644
--- a/test/controllers/revisions_controller_test.rb
+++ b/test/controllers/revisions_controller_test.rb
@@ -1,12 +1,12 @@
 require 'test_helper'
 
 class RevisionsControllerTest < ActionController::TestCase
-  
+
   def setup
     Node.root.descendants.destroy_all
     @user = User.find_by_login("aaron")
     @node = Node.root.children.create!( :slug => "version_me" )
-    
+
     draft = @node.draft
     draft.body = "first"
     @node.publish_draft!
@@ -15,13 +15,13 @@ class RevisionsControllerTest < ActionController::TestCase
     draft.update(:body => "second")
     @node.publish_draft!
   end
-  
+
   test "setup" do
     assert_equal 2, Node.count
     assert_equal 2, @node.pages.count
     assert_equal ["first", "second"], @node.pages.map {|p| p.body}
   end
-  
+
   test "get list of revisions for a given node" do
     login_as :quentin
     get :index, params: { :node_id => @node.id }
@@ -60,13 +60,13 @@ class RevisionsControllerTest < ActionController::TestCase
     )
     assert_response :success
   end
-  
+
   test "restoring a revision" do
     assert_equal "second", @node.head.body
-    
+
     login_as :aaron
     put( :restore, params: { :node_id => @node.id, :id => @node.pages.first.id } )
-    
+
     @node.reload
     assert_equal @node.head, @node.pages.first
     assert_equal "first", @node.head.reload.body
-- 
cgit v1.3


From 205e6216fc7850fe717122c189e5003d1f9e8afe Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 10 Jul 2026 02:03:19 +0200
Subject: Add head/draft/autosave layer comparison at three UI entry points

Node#resolve_page_reference and #available_layer_pairs let
Page#diff_against compare named layers (head/draft/autosave), not
just numbered revisions -- autosave was never part of Node#pages, so
this was the missing piece.

Wired into nodes#show's Status section, nodes#edit right after an
autosave gets resurrected ("What changed?"), and the admin wizard's
current-drafts table, which now also lists autosave-only nodes it
previously never showed.

revisions#diff hides the numbered-revision picker when comparing
named layers (it can't represent them), shows a plain label instead,
and offers buttons to switch between whichever other pairs make
sense for the node's current state. Destroying the topmost layer is
available directly from the diff view, reusing the existing revert!
path.

"Discard changes" is renamed "Discard Autosave" everywhere it
appears, to match "Destroy Draft".
---
 app/controllers/admin_controller.rb           |  4 +--
 app/controllers/nodes_controller.rb           |  2 +-
 app/controllers/revisions_controller.rb       | 16 ++++++++---
 app/helpers/revisions_helper.rb               |  5 ++++
 app/models/node.rb                            | 21 ++++++++++++++
 app/views/admin/index.html.erb                | 13 +++++++--
 app/views/nodes/edit.html.erb                 |  9 +++++-
 app/views/nodes/show.html.erb                 | 12 +++++++-
 app/views/revisions/diff.html.erb             | 40 +++++++++++++++++++++++----
 config/routes.rb                              |  1 +
 test/controllers/admin_controller_test.rb     | 15 ++++++++--
 test/controllers/revisions_controller_test.rb | 39 ++++++++++++++++++++++++++
 test/models/node_test.rb                      | 22 +++++++++++++++
 13 files changed, 179 insertions(+), 20 deletions(-)

(limited to 'test')

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 3fa0519..6ab2135 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -5,10 +5,10 @@ class AdminController < ApplicationController
   before_action :login_required
 
   def index
-    @drafts = Node.where("draft_id IS NOT NULL")
+    @drafts = Node.where("draft_id IS NOT NULL OR autosave_id IS NOT NULL")
       .limit(50).order("updated_at desc")
 
-    @drafts_count = Node.where("draft_id IS NOT NULL").count
+    @drafts_count = Node.where("draft_id IS NOT NULL OR autosave_id IS NOT NULL").count
 
     @recent_changes = Node.where(
       "updated_at < ? AND updated_at > ? AND parent_id IS NOT NULL",
diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 38d42d9..d1538e1 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -72,7 +72,7 @@ class NodesController < ApplicationController
     if @node.autosave
       flash.now[:notice] =
         "This page has unsaved changes from a previous session, shown below. " \
-        "Save to keep them, or use \"Discard changes\" below to go back to the last saved version."
+        "Save to keep them, or use \"Discard Autosave\" below to go back to the last saved version."
     elsif freshly_locked
       flash.now[:notice] = "Node locked and ready to edit"
     end
diff --git a/app/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb
index 9acb26f..4b0c549 100644
--- a/app/controllers/revisions_controller.rb
+++ b/app/controllers/revisions_controller.rb
@@ -21,10 +21,18 @@ class RevisionsController < ApplicationController
       params[:start_revision], params[:end_revision] = 1, 1
     end
 
-    @start      = @node.pages.find_by_revision( params[:start_revision] )
-    @end        = @node.pages.find_by_revision( params[:end_revision] )
-    @diff_view  = params[:view] == "side_by_side" ? :side_by_side : :inline
-    @diff       = @end.diff_against( @start, view: @diff_view )
+    @start = @node.resolve_page_reference(params[:start_revision])
+    @end   = @node.resolve_page_reference(params[:end_revision])
+
+    if @start.nil? || @end.nil?
+      flash[:error] = "That comparison is no longer available."
+      redirect_to(node_path(@node)) and return
+    end
+
+    @diff_view              = params[:view] == "side_by_side" ? :side_by_side : :inline
+    @diff                   = @end.diff_against(@start, view: @diff_view)
+    @available_layer_pairs  = @node.available_layer_pairs
+    @locked_by_other        = @node.locked? && @node.lock_owner != current_user
   end
 
   def show
diff --git a/app/helpers/revisions_helper.rb b/app/helpers/revisions_helper.rb
index fdb51f8..a629013 100644
--- a/app/helpers/revisions_helper.rb
+++ b/app/helpers/revisions_helper.rb
@@ -1,2 +1,7 @@
 module RevisionsHelper
+  # Human-readable label for a diff endpoint -- "head"/"draft"/"autosave"
+  # get their name; anything else is a revision number.
+  def describe_page_reference(ref)
+    %w[head draft autosave].include?(ref.to_s) ? ref.to_s.capitalize : "revision #{ref}"
+  end
 end
diff --git a/app/models/node.rb b/app/models/node.rb
index 7675ab6..82d9954 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -123,6 +123,27 @@ class Node < ApplicationRecord
     self.draft.reload
   end
 
+  def resolve_page_reference ref
+    case ref.to_s
+    when "head" then head
+    when "draft" then draft
+    when "autosave" then autosave
+    else pages.find_by_revision(ref)
+    end
+  end
+
+  # Which layer-pairs are meaningful to compare right now, given this
+  # node's actual state. Head vs autosave only shows up when no draft
+  # sits between them -- with a draft present, autosave is compared
+  # against the draft, never past it straight to head.
+  def available_layer_pairs
+    pairs = []
+    pairs << [:head, :draft]     if head && draft
+    pairs << [:draft, :autosave] if draft && autosave
+    pairs << [:head, :autosave]  if head && autosave && !draft
+    pairs
+  end
+
   def find_or_create_draft current_user
     self.wipe_draft!
     if draft && self.lock_owner == current_user
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
index 77b45f4..c67ccb3 100644
--- a/app/views/admin/index.html.erb
+++ b/app/views/admin/index.html.erb
@@ -82,9 +82,9 @@
 </div>
 
 <div id="current_drafts_table">
-  
-  <h2>Current Drafts (<%= @drafts_count %>)</h2>
-  
+
+  <h2>Current Drafts & Autosaves (<%= @drafts_count %>)</h2>
+
   <table class="node_table">
     <tr class="header">
       <th class="node_id">ID</th>
@@ -92,6 +92,7 @@
       <th class="actions">Actions</th>
       <th class="editor">Locked by</th>
       <th class="revision">Rev.</th>
+      <th class="autosave">Autosave</th>
     </tr>
     <% @drafts.each do |node| %>
     <tr class="<%= cycle("even", "odd") %>">
@@ -103,6 +104,9 @@
       <td class="actions">
         <%= link_to 'show',      node_path(node) %>
         <%= link_to 'Revisions', node_revisions_path(node) %>
+        <% if pair = node.available_layer_pairs.last %>
+          <%= link_to 'diff', diff_node_revisions_path(node, start_revision: pair.first, end_revision: pair.last) %>
+        <% end %>
       </td>
       <td>
         <%= node.lock_owner.login if node.lock_owner %>
@@ -110,6 +114,9 @@
       <td>
         <%= link_to ( node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY" ) ), node_revisions_path(node) %>
       </td>
+      <td class="autosave">
+        <%= node.autosave ? "unsaved changes" : "" %>
+      </td>
     </tr>
     <% end %>
   </table>
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index cdc9b36..1c19410 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -6,9 +6,16 @@
         disabled: @node.autosave.present? %>
 
   <% if @node.autosave || (@node.draft && @node.head) %>
-    <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard changes'),
+    <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
           revert_node_path(@node), method: :put,
           form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } %>
+    <% if pair = @node.available_layer_pairs.find { |p| p.include?(:autosave) } %>
+      <%= button_to 'What changed?',
+            diff_node_revisions_path(@node),
+            method: :get,
+            params: { start_revision: pair.first, end_revision: pair.last },
+            form: { class: 'button_to computation' } %>
+    <% end %>
   <% end %>
 
   <%= submit_tag "Save Draft", form: dom_id(@node, :edit) %>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 036caf2..2469310 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -32,6 +32,16 @@
           <% end %>
         </div>
 
+        <% @node.available_layer_pairs.each do |pair| %>
+          <div class="node_info_item">
+            <%= button_to "Diff #{pair.first.to_s.capitalize} vs. #{pair.last.to_s.capitalize}",
+                  diff_node_revisions_path(@node),
+                  method: :get,
+                  params: { start_revision: pair.first, end_revision: pair.last },
+                  form: { class: 'button_to computation' } %>
+          </div>
+        <% end %>
+
         <% unless locked_by_other %>
           <% if @node.draft && !@node.autosave %>
             <div class="node_info_item">
@@ -41,7 +51,7 @@
           <% end %>
           <% if @node.draft || @node.autosave %>
             <div class="node_info_item">
-              <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard changes'),
+              <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
                     revert_node_path(@node), method: :put,
                     form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } %>
             </div>
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index d7bb528..3157dca 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -4,11 +4,41 @@
   <%= link_to 'Revisions', node_revisions_path(@node) %>
 </p>
 
-<%= form_tag diff_node_revisions_path do %>
-  <%= select_tag :start_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:start_revision].to_i) %>
-  <%= select_tag :end_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:end_revision].to_i) %>
-  <%= select_tag :view, options_for_select([['Inline', 'inline'], ['Side by side', 'side_by_side']], @diff_view) %>
-  <%= submit_tag 'Diff' %>
+<p class="diff_comparison_label">
+  Comparing <strong><%= describe_page_reference(params[:start_revision]) %></strong>
+  against <strong><%= describe_page_reference(params[:end_revision]) %></strong>
+</p>
+
+<% numeric_comparison = params[:start_revision].to_s =~ /\A\d+\z/ && params[:end_revision].to_s =~ /\A\d+\z/ %>
+
+<% if numeric_comparison %>
+  <%= form_tag diff_node_revisions_path do %>
+    <%= select_tag :start_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:start_revision].to_i) %>
+    <%= select_tag :end_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:end_revision].to_i) %>
+    <%= select_tag :view, options_for_select([['Inline', 'inline'], ['Side by side', 'side_by_side']], @diff_view) %>
+    <%= submit_tag 'Diff' %>
+  <% end %>
+<% else %>
+  <p class="node_action_bar standalone_action_bar"><%= link_to 'Compare two numbered revisions instead', node_revisions_path(@node) %></p>
+<% end %>
+
+<% if @available_layer_pairs.present? %>
+  <p class="node_action_bar standalone_action_bar">
+    <% @available_layer_pairs.each do |pair| %>
+      <% next if [params[:start_revision].to_s, params[:end_revision].to_s].sort == pair.map(&:to_s).sort %>
+      <%= button_to "Diff #{pair.first.to_s.capitalize} vs. #{pair.last.to_s.capitalize}",
+            diff_node_revisions_path(@node),
+            method: :get,
+            params: { start_revision: pair.first, end_revision: pair.last, view: @diff_view },
+            form: { class: 'button_to computation' } %>
+    <% end %>
+
+    <% if !@locked_by_other && (@node.autosave || @node.draft) %>
+      <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
+            revert_node_path(@node), method: :put,
+            form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } %>
+    <% end %>
+  </p>
 <% end %>
 
 <div id="diffview">
diff --git a/config/routes.rb b/config/routes.rb
index c0aef2f..da6b626 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -47,6 +47,7 @@ Cccms::Application.routes.draw do
       resources :revisions do
         collection do
           post :diff
+          get  :diff
         end
         member do
           put :restore
diff --git a/test/controllers/admin_controller_test.rb b/test/controllers/admin_controller_test.rb
index 9bbf29b..d6005ba 100644
--- a/test/controllers/admin_controller_test.rb
+++ b/test/controllers/admin_controller_test.rb
@@ -1,8 +1,17 @@
 require 'test_helper'
 
 class AdminControllerTest < ActionController::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
+  test "current drafts includes nodes with only an autosave" do
+    node = Node.root.children.create!(:slug => "admin_autosave_only")
+    node.lock_for_editing!(User.find_by_login("aaron"))
+    node.autosave!({title: "in progress"}, User.find_by_login("aaron"))
+    node.save_draft!(User.find_by_login("aaron"))
+    node.publish_draft!
+    node.lock_for_editing!(User.find_by_login("aaron"))
+    node.autosave!({title: "editing again"}, User.find_by_login("aaron"))
+
+    login_as :quentin
+    get :index
+    assert_includes assigns(:drafts), node
   end
 end
diff --git a/test/controllers/revisions_controller_test.rb b/test/controllers/revisions_controller_test.rb
index caca6bf..162e6f1 100644
--- a/test/controllers/revisions_controller_test.rb
+++ b/test/controllers/revisions_controller_test.rb
@@ -100,4 +100,43 @@ class RevisionsControllerTest < ActionController::TestCase
     assert_response :success
     assert_select ".diff_column", 2
   end
+
+  test "diffing head against draft by name" do
+    login_as :quentin
+    @node.find_or_create_draft(@user)
+    @node.draft.update(:body => "draft body")
+
+    post(:diff, params: { :node_id => @node.id, :start_revision => "head", :end_revision => "draft" })
+    assert_response :success
+  end
+
+  test "diffing a layer pair that no longer exists redirects with a flash" do
+    login_as :quentin
+    post(:diff, params: { :node_id => @node.id, :start_revision => "draft", :end_revision => "autosave" })
+    assert_redirected_to node_path(@node)
+    assert flash[:error].present?
+  end
+
+  test "diffing by name shows a clear comparison label instead of a misleading revision picker" do
+    login_as :quentin
+    @node.find_or_create_draft(@user)
+
+    post(:diff, params: { :node_id => @node.id, :start_revision => "head", :end_revision => "draft" })
+    assert_response :success
+    assert_select "strong", "Head"
+    assert_select "strong", "Draft"
+    assert_select "select[name=?]", "start_revision", :count => 0
+  end
+
+  test "pair-switcher buttons carry their params as real hidden fields, not a query string" do
+    login_as :quentin
+    @node.find_or_create_draft(@user)
+    @node.lock_for_editing!(@user)
+    @node.autosave!({ :body => "unsaved" }, @user)
+
+    post(:diff, params: { :node_id => @node.id, :start_revision => "head", :end_revision => "draft" })
+    assert_response :success
+    assert_select "form.computation input[type=hidden][name=start_revision]"
+    assert_select "form.computation input[type=hidden][name=end_revision]"
+  end
 end
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 2138c19..9e71dec 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -473,4 +473,26 @@ class NodeTest < ActiveSupport::TestCase
       node.publish_draft!
     end
   end
+
+  test "available_layer_pairs matches the six-state table" do
+    node = Node.root.children.create!(:slug => "layer_pairs_test")
+    user = @user1 || User.find_by_login("aaron")
+
+    assert_equal [[:draft, :autosave]], (node.lock_for_editing!(user); node.autosave!({title: "v1"}, user); node.available_layer_pairs) # state F
+
+    node.save_draft!(user)
+    node.publish_draft!
+    assert_equal [], node.available_layer_pairs # state A
+
+    node.lock_for_editing!(user)
+    node.autosave!({title: "v2"}, user)
+    assert_equal [[:head, :autosave]], node.available_layer_pairs # state B
+
+    node.save_draft!(user)
+    assert_equal [[:head, :draft]], node.available_layer_pairs # state C
+
+    node.lock_for_editing!(user)
+    node.autosave!({title: "v3"}, user)
+    assert_equal [[:head, :draft], [:draft, :autosave]], node.available_layer_pairs # state D
+  end
 end
-- 
cgit v1.3


From c2b2648d327e1c1749c37fe2e58cd051ed871547 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 10 Jul 2026 02:13:02 +0200
Subject: Destroying Draft or Discarding Autosave drops you where you left

---
 app/controllers/nodes_controller.rb       |  5 +++-
 app/views/nodes/show.html.erb             |  1 +
 app/views/revisions/diff.html.erb         |  1 +
 test/controllers/nodes_controller_test.rb | 39 +++++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index d1538e1..6fcd930 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -128,7 +128,10 @@ class NodesController < ApplicationController
   def revert
     @node.lock_for_editing!(current_user)
     @node.revert!(current_user)
-    if @node.draft
+
+    if params[:return_to].present?
+      redirect_to safe_return_to(params[:return_to])
+    elsif @node.draft
       redirect_to edit_node_path(@node)
     else
       redirect_to node_path(@node)
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 2469310..8b9e98b 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -53,6 +53,7 @@
             <div class="node_info_item">
               <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
                     revert_node_path(@node), method: :put,
+                    params: { return_to: request.path },
                     form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } %>
             </div>
           <% end %>
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index 3157dca..490cf17 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -36,6 +36,7 @@
     <% if !@locked_by_other && (@node.autosave || @node.draft) %>
       <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
             revert_node_path(@node), method: :put,
+            params: { return_to: request.fullpath },
             form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } %>
     <% end %>
   </p>
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index f3e04c2..ce3419c 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -423,4 +423,43 @@ class NodesControllerTest < ActionController::TestCase
     assert_select "form.button_to.destructive", count: 0
   end
 
+  test "reverting from nodes#show returns to the show page, not the editor, even if a draft remains" do
+    user = User.find_by_login("aaron")
+    node = Node.root.children.create!(:slug => "revert_return_to_test")
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v1"}, user)
+    node.save_draft!(user)
+    node.publish_draft!
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v2"}, user)
+    node.save_draft!(user)
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v3"}, user)
+    # state D: head, draft, and autosave all present, locked by aaron
+
+    login_as :aaron
+    put :revert, params: { :id => node.id, :return_to => node_path(node) }
+    assert_redirected_to node_path(node)
+    node.reload
+    assert node.draft.present?
+    assert node.autosave.blank?
+  end
+
+  test "reverting from nodes#edit without return_to still lands back in the editor when a draft remains" do
+    user = User.find_by_login("aaron")
+    node = Node.root.children.create!(:slug => "revert_default_test")
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v1"}, user)
+    node.save_draft!(user)
+    node.publish_draft!
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v2"}, user)
+    node.save_draft!(user)
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v3"}, user)
+
+    login_as :aaron
+    put :revert, params: { :id => node.id }
+    assert_redirected_to edit_node_path(node)
+  end
 end
-- 
cgit v1.3


From cf730b751b590ca80695492f5d62c4fb43efb4d3 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 10 Jul 2026 03:40:48 +0200
Subject: Ensure that comparison view toggle is there for all diff modes

---
 app/views/revisions/diff.html.erb             | 17 ++++++++++++++++-
 public/stylesheets/admin.css                  |  1 +
 test/controllers/revisions_controller_test.rb |  9 +++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index 490cf17..d70503c 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -9,13 +9,28 @@
   against <strong><%= describe_page_reference(params[:end_revision]) %></strong>
 </p>
 
+<p class="diff_view_toggle">
+  View:
+  <% if @diff_view == :inline %>
+    <strong>Inline</strong>
+  <% else %>
+    <%= link_to 'Inline', diff_node_revisions_path(@node, start_revision: params[:start_revision], end_revision: params[:end_revision], view: 'inline') %>
+  <% end %>
+  &middot;
+  <% if @diff_view == :side_by_side %>
+    <strong>Side by side</strong>
+  <% else %>
+    <%= link_to 'Side by side', diff_node_revisions_path(@node, start_revision: params[:start_revision], end_revision: params[:end_revision], view: 'side_by_side') %>
+  <% end %>
+</p>
+
 <% numeric_comparison = params[:start_revision].to_s =~ /\A\d+\z/ && params[:end_revision].to_s =~ /\A\d+\z/ %>
 
 <% if numeric_comparison %>
   <%= form_tag diff_node_revisions_path do %>
     <%= select_tag :start_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:start_revision].to_i) %>
     <%= select_tag :end_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:end_revision].to_i) %>
-    <%= select_tag :view, options_for_select([['Inline', 'inline'], ['Side by side', 'side_by_side']], @diff_view) %>
+    <%= hidden_field_tag :view, @diff_view %>
     <%= submit_tag 'Diff' %>
   <% end %>
 <% else %>
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 56470bc..510e3cc 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -32,6 +32,7 @@ table.user_table a,
 table.revisions_table a,
 .add_child_links a,
 .standalone_action_bar a,
+.diff_view_toggle a,
 div#draft_list table td.actions a {
   text-decoration: underline;
   -webkit-text-decoration-style: wavy;
diff --git a/test/controllers/revisions_controller_test.rb b/test/controllers/revisions_controller_test.rb
index 162e6f1..bf92c5b 100644
--- a/test/controllers/revisions_controller_test.rb
+++ b/test/controllers/revisions_controller_test.rb
@@ -139,4 +139,13 @@ class RevisionsControllerTest < ActionController::TestCase
     assert_select "form.computation input[type=hidden][name=start_revision]"
     assert_select "form.computation input[type=hidden][name=end_revision]"
   end
+
+  test "the view toggle is available even when comparing named layers" do
+    login_as :quentin
+    @node.find_or_create_draft(@user)
+
+    post(:diff, params: { :node_id => @node.id, :start_revision => "head", :end_revision => "draft" })
+    assert_response :success
+    assert_select "a", "Side by side"
+  end
 end
-- 
cgit v1.3


From fd98a2d3053279bd4a848faa52a3ac676db10cbb Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 10 Jul 2026 03:59:34 +0200
Subject: Stop diff output from corrupting the document on structural tag
 changes

sdiff aligned an inserted paragraph break correctly, but the renderer
wrapped the raw </p>/<p> tokens in <ins> regardless -- invalid nesting
that browsers silently repair by dropping the unmatched closing tag,
leaving everything downstream rendered inside an <ins> with nothing
left to close it. Same failure mode as the retired cacycle_diff.js,
different cause.

Tag tokens now render as a plain-text pilcrow with a tooltip naming
the actual tag, never as literal markup inside <ins>/<del>. Applies to
both inline and side-by-side. Side-by-side's new panel flattening a
real paragraph break into a marker, rather than showing its own true
structure, is a known, accepted trade-off for now -- not the same
problem, and not fixed here.
---
 lib/html_word_diff.rb    | 36 +++++++++++++++++++++++++++++-------
 test/models/page_test.rb | 18 ++++++++++++++++++
 2 files changed, 47 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/lib/html_word_diff.rb b/lib/html_word_diff.rb
index 1f28cf5..aa0cb86 100644
--- a/lib/html_word_diff.rb
+++ b/lib/html_word_diff.rb
@@ -1,4 +1,5 @@
 require 'diff/lcs'
+require 'cgi'
 
 module HtmlWordDiff
   TOKEN_REGEXP = /<[^>]*>|[[:space:]]+|[[:alnum:]]+|[^[:space:][:alnum:]<>]/
@@ -10,11 +11,12 @@ module HtmlWordDiff
       when '='
         html << new_token
       when '-'
-        html << "<del>#{old_token}</del>"
+        html << wrap_removed(old_token)
       when '+'
-        html << "<ins>#{new_token}</ins>"
+        html << wrap_inserted(new_token)
       when '!'
-        html << "<del>#{old_token}</del><ins>#{new_token}</ins>"
+        html << wrap_removed(old_token)
+        html << wrap_inserted(new_token)
       end
     end
     html
@@ -29,12 +31,12 @@ module HtmlWordDiff
         old_out << old_token
         new_out << new_token
       when '-'
-        old_out << "<del>#{old_token}</del>"
+        old_out << wrap_removed(old_token)
       when '+'
-        new_out << "<ins>#{new_token}</ins>"
+        new_out << wrap_inserted(new_token)
       when '!'
-        old_out << "<del>#{old_token}</del>"
-        new_out << "<ins>#{new_token}</ins>"
+        old_out << wrap_removed(old_token)
+        new_out << wrap_inserted(new_token)
       end
     end
     [old_out, new_out]
@@ -49,4 +51,24 @@ module HtmlWordDiff
   def self.tokenize(html)
     html.to_s.scan(TOKEN_REGEXP)
   end
+
+  def self.tag_token?(token)
+    token.to_s.match?(/\A<[^>]*>\z/)
+  end
+
+  def self.wrap_removed(token)
+    if tag_token?(token)
+      %(<del class="diff_structural" title="removed: #{CGI.escapeHTML(token)}">\u00b6</del>)
+    else
+      "<del>#{token}</del>"
+    end
+  end
+
+  def self.wrap_inserted(token)
+    if tag_token?(token)
+      %(<ins class="diff_structural" title="added: #{CGI.escapeHTML(token)}">\u00b6</ins>)
+    else
+      "<ins>#{token}</ins>"
+    end
+  end
 end
diff --git a/test/models/page_test.rb b/test/models/page_test.rb
index ac5691a..3868a53 100644
--- a/test/models/page_test.rb
+++ b/test/models/page_test.rb
@@ -210,4 +210,22 @@ class PageTest < ActiveSupport::TestCase
     assert_match "<del>Old</del>", old_html
     assert_match "<ins>New</ins>", new_html
   end
+
+  test "diff_against handles an inserted paragraph split without corrupting the document" do
+    n = Node.root.children.create! :slug => "paragraph_split_test"
+    d = n.find_or_create_draft @user1
+    d.body = "<p>Der Vortragsraum ist ab 19 Uhr geöffnet, der Zugang erfolgt über den Hinterhof.</p>"
+    d.save!
+    n.publish_draft!
+
+    d2 = n.find_or_create_draft @user1
+    d2.body = "<p>Der Vortragsraum ist ab 19 Uhr geöffnet,</p>\n<p>der Zugang erfolgt über den Hinterhof.</p>"
+    d2.save!
+
+    diff = d2.diff_against(n.head)
+    fragment = Nokogiri::HTML::DocumentFragment.parse(diff[:body])
+
+    assert_equal 2, fragment.css('ins.diff_structural').length
+    assert_match "der Zugang erfolgt über den Hinterhof.", fragment.text
+  end
 end
-- 
cgit v1.3


From 30ed9fd9a8bffb44e6ab91dfedb8c0e33837769a Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 10 Jul 2026 04:41:54 +0200
Subject: Include assets, tags and template in diff between revisions

---
 app/models/page.rb                            | 33 ++++++++++++--------
 app/views/revisions/diff.html.erb             | 27 +++++++++++++++++
 public/stylesheets/admin.css                  | 11 +++++++
 test/controllers/revisions_controller_test.rb | 13 ++++++++
 test/models/page_test.rb                      | 43 +++++++++++++++++++++++++++
 5 files changed, 114 insertions(+), 13 deletions(-)

(limited to 'test')

diff --git a/app/models/page.rb b/app/models/page.rb
index ea04cd6..740d42e 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -176,19 +176,26 @@ class Page < ApplicationRecord
   end
 
   def diff_against other, view: :inline
-    if view == :side_by_side
-      {
-        title:    HtmlWordDiff.side_by_side(other.title.to_s,    title.to_s),
-        abstract: HtmlWordDiff.side_by_side(other.abstract.to_s, abstract.to_s),
-        body:     HtmlWordDiff.side_by_side(other.body.to_s,     body.to_s)
-      }
-    else
-      {
-        title:    HtmlWordDiff.inline(other.title.to_s,    title.to_s),
-        abstract: HtmlWordDiff.inline(other.abstract.to_s, abstract.to_s),
-        body:     HtmlWordDiff.inline(other.body.to_s,     body.to_s)
-      }
-    end
+    text_diffs =
+      if view == :side_by_side
+        {
+          title:    HtmlWordDiff.side_by_side(other.title.to_s,    title.to_s),
+          abstract: HtmlWordDiff.side_by_side(other.abstract.to_s, abstract.to_s),
+          body:     HtmlWordDiff.side_by_side(other.body.to_s,     body.to_s)
+        }
+      else
+        {
+          title:    HtmlWordDiff.inline(other.title.to_s,    title.to_s),
+          abstract: HtmlWordDiff.inline(other.abstract.to_s, abstract.to_s),
+          body:     HtmlWordDiff.inline(other.body.to_s,     body.to_s)
+        }
+      end
+
+    text_diffs.merge(
+      tags:          { added: tag_list.to_a - other.tag_list.to_a, removed: other.tag_list.to_a - tag_list.to_a },
+      template_name: { from: other.template_name, to: template_name, changed: template_name != other.template_name },
+      assets:        { added: assets.to_a - other.assets.to_a, removed: other.assets.to_a - assets.to_a }
+    )
   end
 
   def public?
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index d70503c..b9ce6bd 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -85,4 +85,31 @@
     <h3>Body</h3>
     <%= raw @diff[:body] %>
   <% end %>
+
+  <h3>Tags</h3>
+  <% if @diff[:tags][:added].empty? && @diff[:tags][:removed].empty? %>
+    <p class="diff_unchanged">No change.</p>
+  <% else %>
+    <ul class="diff_set_list">
+      <% @diff[:tags][:added].each do |tag| %><li><ins><%= tag %></ins></li><% end %>
+      <% @diff[:tags][:removed].each do |tag| %><li><del><%= tag %></del></li><% end %>
+    </ul>
+  <% end %>
+
+  <h3>Template</h3>
+  <% if @diff[:template_name][:changed] %>
+    <p><del><%= @diff[:template_name][:from] || '(none)' %></del> <ins><%= @diff[:template_name][:to] || '(none)' %></ins></p>
+  <% else %>
+    <p class="diff_unchanged">No change.</p>
+  <% end %>
+
+  <h3>Assets</h3>
+  <% if @diff[:assets][:added].empty? && @diff[:assets][:removed].empty? %>
+    <p class="diff_unchanged">No change.</p>
+  <% else %>
+    <ul class="diff_set_list">
+      <% @diff[:assets][:added].each do |asset| %><li><ins><%= asset.upload_file_name %></ins></li><% end %>
+      <% @diff[:assets][:removed].each do |asset| %><li><del><%= asset.upload_file_name %></del></li><% end %>
+    </ul>
+  <% end %>
 </div>
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index e04499d..7b39c72 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -549,6 +549,17 @@ table.revisions_table tr:hover {
   cursor: help;
 }
 
+.diff_unchanged {
+  color: #969696;
+  font-style: italic;
+}
+
+.diff_set_list {
+  list-style: none;
+  padding-left: 0;
+  margin: 0;
+}
+
 table.user_table td.user_login {
   padding-right: 30px;
 }
diff --git a/test/controllers/revisions_controller_test.rb b/test/controllers/revisions_controller_test.rb
index bf92c5b..53927b4 100644
--- a/test/controllers/revisions_controller_test.rb
+++ b/test/controllers/revisions_controller_test.rb
@@ -148,4 +148,17 @@ class RevisionsControllerTest < ActionController::TestCase
     assert_response :success
     assert_select "a", "Side by side"
   end
+
+  test "diffing two revisions also shows tag, template, and asset changes" do
+    login_as :quentin
+    @node.find_or_create_draft(@user)
+    @node.draft.tag_list = "update"
+    @node.draft.save!
+
+    post(:diff, params: { :node_id => @node.id, :start_revision => @node.pages.first.revision, :end_revision => @node.pages.last.revision })
+    assert_response :success
+    assert_select "h3", "Tags"
+    assert_select "h3", "Template"
+    assert_select "h3", "Assets"
+  end
 end
diff --git a/test/models/page_test.rb b/test/models/page_test.rb
index 3868a53..bcddc89 100644
--- a/test/models/page_test.rb
+++ b/test/models/page_test.rb
@@ -228,4 +228,47 @@ class PageTest < ActiveSupport::TestCase
     assert_equal 2, fragment.css('ins.diff_structural').length
     assert_match "der Zugang erfolgt über den Hinterhof.", fragment.text
   end
+
+  test "diff_against reports tag and template changes" do
+    n = Node.root.children.create! :slug => "field_diff_test"
+    d = n.find_or_create_draft @user1
+    d.tag_list = "update"
+    d.template_name = "standard_template"
+    d.save!
+    n.publish_draft!
+
+    d2 = n.find_or_create_draft @user1
+    d2.tag_list = "update, pressemitteilung"
+    d2.template_name = "title_only"
+    d2.save!
+
+    diff = d2.diff_against(n.head)
+
+    assert_equal ["pressemitteilung"], diff[:tags][:added]
+    assert_equal [], diff[:tags][:removed]
+    assert diff[:template_name][:changed]
+    assert_equal "standard_template", diff[:template_name][:from]
+    assert_equal "title_only", diff[:template_name][:to]
+  end
+
+  test "diff_against reports added and removed assets by filename" do
+    n = Node.root.children.create! :slug => "asset_diff_test"
+    d = n.find_or_create_draft @user1
+    d.save!
+    n.publish_draft!
+
+    kept_asset    = Asset.create!(:upload_file_name => "kept.png", :upload_content_type => "image/png", :upload_file_size => 1)
+    removed_asset = Asset.create!(:upload_file_name => "removed.pdf", :upload_content_type => "application/pdf", :upload_file_size => 1)
+    n.head.update_assets([kept_asset.id, removed_asset.id])
+
+    d2 = n.find_or_create_draft @user1
+    added_asset = Asset.create!(:upload_file_name => "added.png", :upload_content_type => "image/png", :upload_file_size => 1)
+    d2.update_assets([kept_asset.id, added_asset.id])
+    d2.save!
+
+    diff = d2.diff_against(n.head)
+
+    assert_equal [added_asset], diff[:assets][:added]
+    assert_equal [removed_asset], diff[:assets][:removed]
+  end
 end
-- 
cgit v1.3


From d12598f17547d6b6ad817f32bc6419556ecdf019 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 10 Jul 2026 04:44:58 +0200
Subject: Add test for backlink in revisions#index

---
 test/controllers/revisions_controller_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'test')

diff --git a/test/controllers/revisions_controller_test.rb b/test/controllers/revisions_controller_test.rb
index 53927b4..76d4e8c 100644
--- a/test/controllers/revisions_controller_test.rb
+++ b/test/controllers/revisions_controller_test.rb
@@ -161,4 +161,11 @@ class RevisionsControllerTest < ActionController::TestCase
     assert_select "h3", "Template"
     assert_select "h3", "Assets"
   end
+
+  test "revisions#index links back to the node" do
+    login_as :quentin
+    get :index, params: { :node_id => @node.id }
+    assert_response :success
+    assert_select "a[href=?]", node_path(@node)
+  end
 end
-- 
cgit v1.3


From c9401e45433ea45b46f9a8faf1e7e537e4683244 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 10 Jul 2026 18:07:15 +0200
Subject: Fix rrule/url column overflow on events#index

Long RRULEs previously overflowed their column with no wrap point;
now escaped and rendered with a <wbr> after each semicolon, so a
long rule wraps at a clause boundary instead of running off the
table. Deliberately not truncated -- a cut-off RRULE's trailing
clause (BYDAY, BYMONTH, etc.) is usually the most specific part.

The url column is now a real link, truncated with an ellipsis at a
fixed width -- deliberately no tooltip, since hovering a real link
already shows the full address in the browser's own status bar.

rrule_with_break_opportunities splits on the raw string's own
semicolons before escaping each piece, not after -- escaping first
and searching the result for semicolons also matches the ones inside
&lt;/&gt; entities, corrupting anything containing a literal < or >.
---
 app/helpers/events_helper.rb              | 11 +++++++++++
 app/views/events/index.html.erb           |  8 ++++++--
 public/stylesheets/admin.css              | 15 +++++++++++++++
 test/models/helpers/events_helper_test.rb | 21 +++++++++++++++++++++
 4 files changed, 53 insertions(+), 2 deletions(-)

(limited to 'test')

diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 8a9a878..5e84f53 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -1,2 +1,13 @@
+require 'cgi'
+
 module EventsHelper
+  # Insert a zero-width break opportunity after each semicolon, so a long
+  # RRULE can wrap at a clause boundary instead of overflowing its column.
+  # Deliberately <wbr>, not ellipsis -- unlike a URL, an RRULE's trailing
+  # characters (BYDAY, BYMONTH, etc.) are usually the most specific part,
+  # and truncating them would hide exactly the wrong end of the string.
+  def rrule_with_break_opportunities(rrule)
+    return "" if rrule.blank?
+    raw(rrule.split(';', -1).map { |part| CGI.escapeHTML(part) }.join(';<wbr>'))
+  end
 end
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 8127e3a..3d953d5 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -22,9 +22,13 @@
     <td><%= link_to event.display_title, event %></td>
     <td><%=h event.start_time %></td>
     <td><%=h event.end_time %></td>
-    <td><%=h event.rrule %></td>
+    <td class="rrule_cell"><span class="rrule_text"><%= rrule_with_break_opportunities(event.rrule) %></span></td>
     <td><%=h event.allday %></td>
-    <td><%=h event.url %></td>
+    <td class="url_cell">
+    <% if event.url.present? %>
+    <span class="truncate"><%= link_to event.url, event.url %></span>
+    <% end %>
+    </td>
     <td><%= event.node ? link_to(event.node_id, node_path(event.node)) : '' %></td>
     <td><%= link_to 'edit', edit_event_path(event) %></td>
   </tr>
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 1a81728..4723f50 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -519,6 +519,21 @@ table.revisions_table tr:hover {
   background-color: #f1f1f1;
 }
 
+.events_table .rrule_text {
+  display: inline-block;
+  max-width: 300px;
+  overflow-wrap: break-word;
+}
+
+.events_table .truncate {
+  display: inline-block;
+  max-width: 200px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  vertical-align: bottom;
+}
+
 #diffview del {
   background: #ffd7d5;
   color: #82071e;
diff --git a/test/models/helpers/events_helper_test.rb b/test/models/helpers/events_helper_test.rb
index 2e7567e..0486b3e 100644
--- a/test/models/helpers/events_helper_test.rb
+++ b/test/models/helpers/events_helper_test.rb
@@ -1,4 +1,25 @@
 require 'test_helper'
 
 class EventsHelperTest < ActionView::TestCase
+  test "rrule_with_break_opportunities inserts a break opportunity after each semicolon" do
+    result = rrule_with_break_opportunities("FREQ=MONTHLY;BYMONTH=1,2,3;BYDAY=-1TH")
+    assert_equal "FREQ=MONTHLY;<wbr>BYMONTH=1,2,3;<wbr>BYDAY=-1TH", result
+    assert result.html_safe?
+  end
+
+  test "rrule_with_break_opportunities escapes HTML-significant characters" do
+    result = rrule_with_break_opportunities("FREQ=WEEKLY;BYDAY=<script>")
+    assert_no_match /<script>/, result
+    assert_match "&lt;script&gt;", result
+  end
+
+  test "rrule_with_break_opportunities returns an empty string for blank input" do
+    assert_equal "", rrule_with_break_opportunities(nil)
+    assert_equal "", rrule_with_break_opportunities("")
+  end
+
+  test "rrule_with_break_opportunities preserves a trailing semicolon" do
+    result = rrule_with_break_opportunities("FREQ=WEEKLY;")
+    assert_equal "FREQ=WEEKLY;<wbr>", result
+  end
 end
-- 
cgit v1.3


From 48eed5f35ea798c91f1e0a77c13e751145acfc48 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 10 Jul 2026 18:10:57 +0200
Subject: Add the missing assertions two tests were silently running without

Both ran real code and checked nothing -- Minitest's "missing
assertions" warning has been firing on every run this session.

test_find_or_create_draft_if_draft_exists_and_is_owned_by_user called
the method twice but never checked what came back; now confirms the
second call returns the same draft rather than creating a new one,
and leaves the lock and page count untouched.

test_destroy_a_published_node destroyed a node and loaded the admin
index but never checked the response, unlike its two neighbors
covering the same destroy path (dangling pages, orphaned
occurrences). Added the assert_response :success its own shape
already implied.

No behavior changed -- both were passing before for the same reason
they're passing now, they just weren't proving anything.
---
 test/controllers/nodes_controller_test.rb |  1 +
 test/models/node_test.rb                  | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index ce3419c..37091d5 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -355,6 +355,7 @@ class NodesControllerTest < ActionController::TestCase
 
     login_as :quentin
     get :index
+    assert_response :success
   end
 
   test "no dangling pages remain after node removal" do
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 9e71dec..280614e 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -111,15 +111,19 @@ class NodeTest < ActiveSupport::TestCase
     node.publish_draft!
     assert_not_nil node.find_or_create_draft( @user1 )
   end
-  
+
   def test_find_or_create_draft_if_draft_exists_and_is_owned_by_user
     node = Node.root.children.create :slug => "xyz"
     node.publish_draft!
-    
-    node.find_or_create_draft @user1
-    node.find_or_create_draft @user1
+
+    first_call  = node.find_or_create_draft @user1
+    second_call = node.find_or_create_draft @user1
+
+    assert_equal first_call, second_call
+    assert_equal 2, node.pages.count
+    assert_equal @user1, node.lock_owner
   end
-  
+
   def test_exception_if_draft_exists_but_locked_by_another_user
     node = Node.root.children.create :slug => "xyz"
     node.publish_draft!
-- 
cgit v1.3


From 7d6a665b896252537b8b8df2f15e204d04417231 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 10 Jul 2026 21:57:58 +0200
Subject: Fix current_user/uniq inconsistencies in admin#index, remove dead
 query

@mynodes used the bare @current_user ivar instead of the current_user
method (works today only because login_required already forces that
memoization; every other query and controller in this app uses the
method), and .uniq, which is plain Enumerable#uniq here, not
Relation#distinct -- it materializes every joined row into an Array
before deduplicating, rather than deduplicating in SQL.

@mypages had the same ivar pattern, no .order/.limit unlike every
sibling query in this action, and -- confirmed via a full grep -- is
referenced nowhere else in the codebase. Removed rather than bounded;
nothing was ever rendering it.
---
 app/controllers/admin_controller.rb       |  8 +++-----
 test/controllers/admin_controller_test.rb | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 6ab2135..435df57 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -20,12 +20,10 @@ class AdminController < ApplicationController
     ordered_with_level.each { |node, level| @sitemap_depth[node.id] = level }
     @sitemap = ordered_with_level.map(&:first).reject(&:update?)
 
-    @mypages = Page.where("user_id = ? or editor_id = ?", @current_user, @current_user)
-
     @mynodes = Node.joins(:pages)
-              .where("pages.user_id = ? or pages.editor_id = ?", @current_user, @current_user)
-              .order("updated_at desc")
-              .uniq.first(50)
+          .where("pages.user_id = ? or pages.editor_id = ?", current_user, current_user)
+          .order("updated_at desc")
+          .distinct.first(50)
   end
 
   def conventions
diff --git a/test/controllers/admin_controller_test.rb b/test/controllers/admin_controller_test.rb
index d6005ba..13cc1bb 100644
--- a/test/controllers/admin_controller_test.rb
+++ b/test/controllers/admin_controller_test.rb
@@ -14,4 +14,24 @@ class AdminControllerTest < ActionController::TestCase
     get :index
     assert_includes assigns(:drafts), node
   end
+
+  test "my work list shows each matching node only once, even with several revisions by the same user" do
+    login_as :quentin
+    user = User.find_by_login("quentin")
+    node = Node.root.children.create!(:slug => "dedup_test")
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v1"}, user)
+    node.save_draft!(user)
+    node.publish_draft!
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v2"}, user)
+    node.save_draft!(user)
+    node.publish_draft!
+    # three pages now exist on this node, all touched by quentin --
+    # without DISTINCT, the join would return this node three times
+
+    get :index
+    matches = assigns(:mynodes).select { |n| n.id == node.id }
+    assert_equal 1, matches.length
+  end
 end
-- 
cgit v1.3


From ab392d472c15eee3618cb7c02b2b4707151598b6 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Fri, 10 Jul 2026 23:54:38 +0200
Subject: Prevent a staged parent move from crashing on its own descendant

publish_draft! called move_to_child_of before validating the new
parent at all. Staging a node under one of its own descendants
created a real, if transient, cycle in parent_id the instant that
save landed -- and update_unique_names_of_children's after_save
callback, which recurses down through parent_id with no cycle check
and no depth limit, bounced between the two nodes forever, crashing
the whole process with a SystemStackError rather than just producing
bad data.

Now rejected up front with a normal ActiveRecord::RecordInvalid.
---
 app/models/node.rb       |  5 +++++
 test/models/node_test.rb | 12 ++++++++++++
 2 files changed, 17 insertions(+)

(limited to 'test')

diff --git a/app/models/node.rb b/app/models/node.rb
index 82d9954..9cb4840 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -227,6 +227,11 @@ class Node < ApplicationRecord
 
     if staged_parent_id && (staged_parent_id != parent_id)
       new_parent = Node.find(staged_parent_id)
+
+      if new_parent == self || self.descendants.include?(new_parent)
+        raise ActiveRecord::RecordInvalid.new(self), "Cannot move a node under itself or one of its own descendants"
+      end
+
       self.staged_parent_id = nil
       self.save!
       self.move_to_child_of(new_parent)
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 280614e..5626384 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -499,4 +499,16 @@ class NodeTest < ActiveSupport::TestCase
     node.autosave!({title: "v3"}, user)
     assert_equal [[:head, :draft], [:draft, :autosave]], node.available_layer_pairs # state D
   end
+
+  test "publishing a staged move under one's own descendant is rejected, not allowed to crash" do
+    a = Node.root.children.create!(:slug => "cycle_guard_a")
+    b = a.children.create!(:slug => "cycle_guard_b")
+
+    a.staged_parent_id = b.id
+
+    assert_raises(ActiveRecord::RecordInvalid) { a.publish_draft! }
+
+    a.reload
+    assert_equal Node.root.id, a.parent_id
+  end
 end
-- 
cgit v1.3


From 15aff3eff51809d1ce21caab406a0ef8b13624b6 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sat, 11 Jul 2026 01:33:07 +0200
Subject: Do not offer to destroy the only draft of a never-published node

---
 app/views/nodes/show.html.erb             | 2 +-
 test/controllers/nodes_controller_test.rb | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 5756649..07cb5d1 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -49,7 +49,7 @@
                     form: { data: { confirm: "Publish this draft?" }, class: 'button_to state_changing' } %>
             </div>
           <% end %>
-          <% if @node.draft || @node.autosave %>
+          <% if @node.autosave || (@node.draft && @node.head) %>
             <div class="node_info_item">
               <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
                     revert_node_path(@node), method: :put,
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index 37091d5..b563d4d 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -463,4 +463,12 @@ class NodesControllerTest < ActionController::TestCase
     put :revert, params: { :id => node.id }
     assert_redirected_to edit_node_path(node)
   end
+
+  test "nodes#show does not offer to destroy the only draft of a never-published node" do
+    node = Node.root.children.create!(:slug => "draft_only_test")
+    login_as :quentin
+    get :show, params: { :id => node.id }
+    assert_response :success
+    assert_select "form.destructive", :count => 0
+  end
 end
-- 
cgit v1.3


From 92c394b43a0603743b914c6298aab986805ca990 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sat, 11 Jul 2026 23:43:02 +0200
Subject: Add drafts/recent/mine/chapters admin node views

Four NodesController actions -- drafts, recent, mine, chapters --
each building its own base scope, sharing one private method
(index_matching) for search narrowing and pagination. Wizard rewrite
to link into these instead of rendering its own tables is a separate,
later step.

Node.editor_search backs the shared "q" narrowing: an ILIKE substring
match against title/abstract on whichever of head or draft is
present, splitting the term on whitespace and requiring every word to
match somewhere independently, not as one phrase, since real words can
end up separated by markup in the underlying HTML. Deliberately
separate from Node.search, the public content search, which stays
tsvector-based and head-only.

chapters generalizes into /admin/nodes/tags/:tags for an arbitrary
tag list (OR'd, not AND'd), sharing the controller action but
rendering its own template rather than branching inside one view.
---
 app/controllers/nodes_controller.rb       |  45 +++++++++++++
 app/models/node.rb                        |  22 +++++++
 app/views/nodes/_node_list.html.erb       |  39 +++++++++++
 app/views/nodes/chapters.html.erb         |   9 +++
 app/views/nodes/drafts.html.erb           |   3 +
 app/views/nodes/mine.html.erb             |   3 +
 app/views/nodes/recent.html.erb           |   3 +
 app/views/nodes/tags.html.erb             |   3 +
 config/routes.rb                          |   5 ++
 public/stylesheets/admin.css              |  15 +++++
 test/controllers/nodes_controller_test.rb | 104 ++++++++++++++++++++++++++++++
 test/models/node_test.rb                  |  26 ++++++++
 12 files changed, 277 insertions(+)
 create mode 100644 app/views/nodes/_node_list.html.erb
 create mode 100644 app/views/nodes/chapters.html.erb
 create mode 100644 app/views/nodes/drafts.html.erb
 create mode 100644 app/views/nodes/mine.html.erb
 create mode 100644 app/views/nodes/recent.html.erb
 create mode 100644 app/views/nodes/tags.html.erb

(limited to 'test')

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 6fcd930..ede91ad 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -183,6 +183,39 @@ class NodesController < ApplicationController
     render plain: slug_for(params[:title])
   end
 
+  # Filter functions for admin views
+  def drafts
+    base = Node.where("draft_id IS NOT NULL OR autosave_id IS NOT NULL")
+    @nodes = index_matching(base)
+  end
+
+  def recent
+    base = Node.where(
+      "nodes.updated_at < ? AND nodes.updated_at > ? AND nodes.parent_id IS NOT NULL",
+      Time.now, Time.now - 14.days
+    )
+    @nodes = index_matching(base)
+  end
+
+  def mine
+    base = Node.joins(:pages)
+      .where("pages.user_id = ? or pages.editor_id = ?", current_user, current_user)
+      .distinct
+    @nodes = index_matching(base)
+  end
+
+  def chapters
+    @kind_keys = Array(params[:kinds]) & %w[erfa chaostreff]
+    @kind_keys = %w[erfa chaostreff] if @kind_keys.empty?
+    tags = @kind_keys.flat_map { |key| CccConventions::NODE_KINDS[key][:tags] }
+    @nodes = nodes_matching_tags(tags)
+  end
+
+  def tags
+    tags = params[:tags].to_s.split(',').map(&:strip).reject(&:blank?)
+    @nodes = nodes_matching_tags(tags)
+  end
+
   private
 
     def slug_for(title)
@@ -214,4 +247,16 @@ class NodesController < ApplicationController
         config && config[:parent] ? config[:parent].call.id : nil
       end
     end
+
+    def nodes_matching_tags(tags)
+      matching_pages = Page.tagged_with(tags, any: true).reselect(:id)
+      base = Node.where(head_id: matching_pages).or(Node.where(draft_id: matching_pages))
+      index_matching(base)
+    end
+
+    def index_matching(base_scope)
+      scope = base_scope.includes(:head, :draft)
+      scope = scope.merge(Node.editor_search(params[:q])) if params[:q].present?
+      scope.order("nodes.updated_at desc").paginate(page: params[:page], per_page: 25)
+    end
 end
diff --git a/app/models/node.rb b/app/models/node.rb
index 9cb4840..24f3cd0 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -345,6 +345,28 @@ class Node < ApplicationRecord
       .distinct
   end
 
+  # This one is for admin-only views, where finding a draft is the point.
+  # Substring match on whichever of head/draft is present.
+  def self.editor_search(term)
+    words = term.to_s.split(/\s+/).reject(&:blank?)
+    return none if words.empty?
+
+    conditions = []
+    binds = {}
+
+    words.each_with_index do |word, i|
+      key = "term#{i}"
+      binds[key.to_sym] = "%#{sanitize_sql_like(word)}%"
+      conditions << "(head_translations.title ILIKE :#{key} OR head_translations.abstract ILIKE :#{key} " \
+                    "OR draft_translations.title ILIKE :#{key} OR draft_translations.abstract ILIKE :#{key})"
+    end
+
+    joins("LEFT JOIN page_translations head_translations ON head_translations.page_id = nodes.head_id")
+      .joins("LEFT JOIN page_translations draft_translations ON draft_translations.page_id = nodes.draft_id")
+      .where(conditions.join(" AND "), binds)
+      .distinct
+  end
+
   protected
     def lock_for! current_user
       self.lock_owner = current_user
diff --git a/app/views/nodes/_node_list.html.erb b/app/views/nodes/_node_list.html.erb
new file mode 100644
index 0000000..03f38b4
--- /dev/null
+++ b/app/views/nodes/_node_list.html.erb
@@ -0,0 +1,39 @@
+<%= form_tag url_for(controller: params[:controller], action: params[:action]), method: :get, class: "node_search_form" do %>
+  <% Array(params[:kinds]).each do |kind| %>
+    <%= hidden_field_tag "kinds[]", kind %>
+  <% end %>
+  <%= hidden_field_tag :tags, params[:tags] if params[:tags].present? %>
+  <%= text_field_tag :q, params[:q], placeholder: "Search title, abstract, body…" %>
+  <%= submit_tag "Search", class: "action_button" %>
+  <% if params[:q].present? || params[:kinds].present? || params[:tags].present? %>
+    <%= link_to "Reset", url_for(controller: params[:controller], action: params[:action]) %>
+  <% end %>
+<% end %>
+
+<%= will_paginate @nodes %>
+<table class="node_table">
+  <tr class="header">
+    <th class="node_id">ID</th>
+    <th class="title">Title</th>
+    <th class="actions">Actions</th>
+    <th class="editor">Locked by</th>
+    <th class="revision">Rev.</th>
+  </tr>
+  <% @nodes.each do |node| %>
+  <tr class="<%= cycle("even", "odd") %>">
+    <td class="node_id"><%= node.id %></td>
+    <td class="title">
+      <h4><%= link_to title_for_node(node), node_path(node) %></h4>
+      <p><%= link_to_path(node.unique_name, node.unique_name) %></p>
+    </td>
+    <td class="actions">
+      <%= link_to 'show',      node_path(node) %>
+      <%= link_to 'edit',      edit_node_path(node) %>
+      <%= link_to 'revisions', node_revisions_path(node) %>
+    </td>
+    <td><%= node.lock_owner.login if node.lock_owner %></td>
+    <td><%= node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY") %></td>
+  </tr>
+  <% end %>
+</table>
+<%= will_paginate @nodes %>
diff --git a/app/views/nodes/chapters.html.erb b/app/views/nodes/chapters.html.erb
new file mode 100644
index 0000000..939f19c
--- /dev/null
+++ b/app/views/nodes/chapters.html.erb
@@ -0,0 +1,9 @@
+<h1>Chapters</h1>
+
+<%= form_tag chapters_nodes_path, method: :get do %>
+  <label><%= check_box_tag 'kinds[]', 'erfa', @kind_keys.include?('erfa') %> Erfa</label>
+  <label><%= check_box_tag 'kinds[]', 'chaostreff', @kind_keys.include?('chaostreff') %> Chaostreff</label>
+  <%= submit_tag "Filter", class: "action_button" %>
+<% end %>
+
+<%= render 'node_list' %>
diff --git a/app/views/nodes/drafts.html.erb b/app/views/nodes/drafts.html.erb
new file mode 100644
index 0000000..6d0830c
--- /dev/null
+++ b/app/views/nodes/drafts.html.erb
@@ -0,0 +1,3 @@
+<h1>Nodes with drafts or autosaves</h1>
+
+<%= render 'node_list' %>
diff --git a/app/views/nodes/mine.html.erb b/app/views/nodes/mine.html.erb
new file mode 100644
index 0000000..fc5680a
--- /dev/null
+++ b/app/views/nodes/mine.html.erb
@@ -0,0 +1,3 @@
+<h1>My work</h1>
+
+<%= render 'node_list' %>
diff --git a/app/views/nodes/recent.html.erb b/app/views/nodes/recent.html.erb
new file mode 100644
index 0000000..3602775
--- /dev/null
+++ b/app/views/nodes/recent.html.erb
@@ -0,0 +1,3 @@
+<h1>Recently changed</h1>
+
+<%= render 'node_list' %>
diff --git a/app/views/nodes/tags.html.erb b/app/views/nodes/tags.html.erb
new file mode 100644
index 0000000..0ebc6ce
--- /dev/null
+++ b/app/views/nodes/tags.html.erb
@@ -0,0 +1,3 @@
+<h1>Nodes tagged: <%= params[:tags] %></h1>
+
+<%= render 'node_list' %>
diff --git a/config/routes.rb b/config/routes.rb
index aebce90..2c165d2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -37,7 +37,12 @@ Cccms::Application.routes.draw do
 
       resources :nodes do
         collection do
+          get 'tags/:tags', action: :tags, as: :tags, constraints: { tags: /[^\/]+/ }
           get :parameterize_preview
+          get :drafts
+          get :recent
+          get :mine
+          get :chapters
         end
 
         member do
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index 28b8494..aa8b288 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -748,6 +748,21 @@ form.button_to button[type="submit"] {
   margin-bottom: 0;
 }
 
+.node_search_form {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  margin-bottom: 0.75rem;
+}
+
+.node_search_form input[type=text] {
+  padding: 4px 12px;
+  box-sizing: border-box;
+  height: 2.25rem;
+  width: 22rem;
+  border-radius: 2px;
+}
+
 /* Layout only -- the at-rest visibility (wavy underline) for these
    links comes from the scoped rule in Base elements above. */
 .add_child_links {
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index b563d4d..05cb195 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -471,4 +471,108 @@ class NodesControllerTest < ActionController::TestCase
     assert_response :success
     assert_select "form.destructive", :count => 0
   end
+
+  test "drafts includes a never-published node with only a draft" do
+    node = Node.root.children.create!(:slug => "drafts_action_test")
+    login_as :quentin
+    get :drafts
+    assert_includes assigns(:nodes), node
+  end
+
+  test "chapters filters by kind, matching head or draft, and shows both by default" do
+    erfa_node = Node.root.children.create!(:slug => "chapters_erfa_test")
+    erfa_node.find_or_create_draft(@user1)
+    erfa_node.draft.tag_list = "erfa-detail"
+    erfa_node.draft.save!
+    erfa_node.publish_draft!
+
+    chaostreff_node = Node.root.children.create!(:slug => "chapters_chaostreff_test")
+    chaostreff_node.find_or_create_draft(@user1)
+    chaostreff_node.draft.tag_list = "chaostreff-detail"
+    chaostreff_node.draft.save!
+    chaostreff_node.publish_draft!
+
+    login_as :quentin
+
+    get :chapters, params: { :kinds => "erfa" }
+    assert_includes assigns(:nodes), erfa_node
+    assert_not_includes assigns(:nodes), chaostreff_node
+
+    get :chapters
+    assert_includes assigns(:nodes), erfa_node
+    assert_includes assigns(:nodes), chaostreff_node
+  end
+
+  test "recent combined with a search term does not raise an ambiguous column error" do
+    login_as :quentin
+    get :recent, params: { :q => "Zombies" }
+    assert_response :success
+  end
+
+  test "drafts combined with a search term does not raise an ambiguous column error" do
+    login_as :quentin
+    get :drafts, params: { :q => "Zombies" }
+    assert_response :success
+  end
+
+  test "mine combined with a search term does not raise an ambiguous column error" do
+    login_as :quentin
+    get :mine, params: { :q => "Zombies" }
+    assert_response :success
+  end
+
+  test "chapters combined with a search term does not raise an ambiguous column error" do
+    login_as :quentin
+    get :chapters, params: { :q => "Zombies" }
+    assert_response :success
+  end
+
+  test "tags path filters by an arbitrary raw tag, generalizing chapters" do
+    presse_node = Node.root.children.create!(:slug => "tags_path_presse_test")
+    presse_node.find_or_create_draft(@user1)
+    presse_node.draft.tag_list = "pressemitteilung"
+    presse_node.draft.save!
+    presse_node.publish_draft!
+
+    erfa_node = Node.root.children.create!(:slug => "tags_path_erfa_test")
+    erfa_node.find_or_create_draft(@user1)
+    erfa_node.draft.tag_list = "erfa-detail"
+    erfa_node.draft.save!
+    erfa_node.publish_draft!
+
+    login_as :quentin
+    get :tags, params: { :tags => "pressemitteilung" }
+
+    assert_includes assigns(:nodes), presse_node
+    assert_not_includes assigns(:nodes), erfa_node
+
+    assert_select "h1", "Nodes tagged: pressemitteilung"
+    assert_select "h1", :text => "Chapters", :count => 0
+  end
+
+  test "tags path with multiple tags matches any of them, not all" do
+    erfa_node = Node.root.children.create!(:slug => "tags_path_multi_erfa_test")
+    erfa_node.find_or_create_draft(@user1)
+    erfa_node.draft.tag_list = "erfa-detail"
+    erfa_node.draft.save!
+    erfa_node.publish_draft!
+
+    chaostreff_node = Node.root.children.create!(:slug => "tags_path_multi_chaostreff_test")
+    chaostreff_node.find_or_create_draft(@user1)
+    chaostreff_node.draft.tag_list = "chaostreff-detail"
+    chaostreff_node.draft.save!
+    chaostreff_node.publish_draft!
+
+    login_as :quentin
+    get :tags, params: {:tags => "erfa-detail,chaostreff-detail" }
+
+    assert_includes assigns(:nodes), erfa_node
+    assert_includes assigns(:nodes), chaostreff_node
+  end
+
+  test "chapters renders the curated heading" do
+    login_as :quentin
+    get :chapters
+    assert_select "h1", "Chapters"
+  end
 end
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 5626384..15e908b 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -511,4 +511,30 @@ class NodeTest < ActiveSupport::TestCase
     a.reload
     assert_equal Node.root.id, a.parent_id
   end
+
+  test "editor_search matches a partial substring, not just a whole word" do
+    node = Node.root.children.create!(:slug => "editor_search_substring_test")
+    node.find_or_create_draft(@user1)
+    node.draft.update(:title => "Biometrics Conference")
+    node.publish_draft!
+
+    assert_includes Node.editor_search("bio"), node
+    assert_includes Node.editor_search("Conf"), node
+  end
+
+  test "editor_search returns an empty relation for a blank term, not every node" do
+    assert_equal 0, Node.editor_search("").count
+    assert_equal 0, Node.editor_search(nil).count
+    assert_equal 0, Node.editor_search("   ").count
+  end
+
+  test "editor_search requires every word to match, but each word can match a different field" do
+    node = Node.root.children.create!(:slug => "editor_search_multiword_test")
+    node.find_or_create_draft(@user1)
+    node.draft.update(:title => "Backspace e.V. Bamberg", :abstract => "Spiegelgraben 41, 96052 Bamberg")
+    node.publish_draft!
+
+    assert_includes Node.editor_search("Backspace Spiegelgraben"), node
+    assert_equal 0, Node.editor_search("Backspace Nonexistentstreet").count
+  end
 end
-- 
cgit v1.3


From 45bf65d04d046c0ea4a1150096b2a9b846d6c0b8 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sun, 12 Jul 2026 02:15:44 +0200
Subject: Give the sitemap its own view, with collapse and descendant counts

Extracted from admin#index's inline table into NodesController#sitemap.
Nested <details>/<summary> per branch, one linear pass over the
existing flat [node, level] list (no added queries) -- each node's own
descendant count computed the same way, via a small stack rather than
re-walking the tree per node. Branches under updates/, club/erfas,
club/chaostreffs, and disclosure start collapsed by default
(CccConventions::SITEMAP_COLLAPSED_PATHS); any branch currently
collapsed, whether by that default or because someone just closed it,
is highlighted via a plain :not([open]) selector -- no state tracked
outside the DOM itself.

Dropped the update?-post exclusion this view used to rely on -- no
longer needed now that updates/ collapses instead of being filtered
out, so its real children (previously silently absent) now show up
correctly. admin#index's own, separate @sitemap query is unchanged;
that view has no collapse mechanism to compensate and wasn't part of
this.
---
 app/controllers/nodes_controller.rb       | 23 ++++++++++++++
 app/helpers/nodes_helper.rb               |  5 ++-
 app/views/nodes/sitemap.html.erb          | 32 +++++++++++++++++++
 config/routes.rb                          |  1 +
 lib/ccc_conventions.rb                    |  1 +
 public/stylesheets/admin.css              | 40 ++++++++++++++++++++++++
 test/controllers/nodes_controller_test.rb | 52 +++++++++++++++++++++++++++++++
 test/models/helpers/nodes_helper_test.rb  | 11 +++++++
 8 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 app/views/nodes/sitemap.html.erb

(limited to 'test')

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index ede91ad..772bf4b 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -216,6 +216,11 @@ class NodesController < ApplicationController
     @nodes = nodes_matching_tags(tags)
   end
 
+  def sitemap
+    @sitemap = Node.root.self_and_descendants_ordered_with_level
+    @sitemap_descendant_counts = descendant_counts_for(@sitemap)
+  end
+
   private
 
     def slug_for(title)
@@ -248,6 +253,24 @@ class NodesController < ApplicationController
       end
     end
 
+    def descendant_counts_for(ordered_with_level)
+      counts = Hash.new(0)
+      stack = [] # [node, level, index]
+      ordered_with_level.each_with_index do |(node, level), index|
+        while stack.any? && stack.last[1] >= level
+          ancestor_node, _ancestor_level, ancestor_index = stack.pop
+          counts[ancestor_node.id] = index - ancestor_index - 1
+        end
+        stack << [node, level, index]
+      end
+      total = ordered_with_level.length
+      while stack.any?
+        ancestor_node, _ancestor_level, ancestor_index = stack.pop
+        counts[ancestor_node.id] = total - ancestor_index - 1
+      end
+      counts
+    end
+
     def nodes_matching_tags(tags)
       matching_pages = Page.tagged_with(tags, any: true).reselect(:id)
       base = Node.where(head_id: matching_pages).or(Node.where(draft_id: matching_pages))
diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index a89f879..1268b63 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -12,7 +12,6 @@ module NodesHelper
     end
   end
   
-  
   def truncated_title_for_node node
     if (title = title_for_node node) && title.size > 20
       "<span title='#{title}'>#{truncate(title, 40)}</span>"
@@ -63,4 +62,8 @@ module NodesHelper
     path = node.unique_path
     CccConventions::NODE_KINDS.select { |_, config| config[:parent_match]&.call(path) }
   end
+
+  def sitemap_node_open?(node)
+    !CccConventions::SITEMAP_COLLAPSED_PATHS.include?(node.unique_name)
+  end
 end
diff --git a/app/views/nodes/sitemap.html.erb b/app/views/nodes/sitemap.html.erb
new file mode 100644
index 0000000..a799c17
--- /dev/null
+++ b/app/views/nodes/sitemap.html.erb
@@ -0,0 +1,32 @@
+<h1>Sitemap</h1>
+
+<div id="sitemap">
+<%
+  open_details = [] # levels with a currently-open <details>
+%>
+<% @sitemap.each_with_index do |(node, level), index| %>
+  <% while open_details.any? && open_details.last >= level %>
+    </details>
+    <% open_details.pop %>
+  <% end %>
+
+  <div class="sitemap_node">
+    <h4><%= link_to title_for_node(node), node_path(node) %></h4>
+    <span class="field_hint"><%= link_to_path("#{node.unique_name} ↗", node.unique_name) %></span>
+    <p class="sitemap_node_actions">
+      <%= link_to 'Show', node_path(node) %>
+      <%= link_to 'Create Child', new_node_path(:parent_id => node.id) %>
+    </p>
+  </div>
+
+  <% next_level = @sitemap[index + 1]&.last %>
+  <% if next_level && next_level > level %>
+    <details<%= ' open' if sitemap_node_open?(node) %>>
+      <summary>
+        <%= pluralize(@sitemap_descendant_counts[node.id], 'descendant', 'descendants') %>
+      </summary>
+    <% open_details.push(level) %>
+  <% end %>
+<% end %>
+<% open_details.length.times { %></details><% } %>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
index 2c165d2..bb34bd8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -43,6 +43,7 @@ Cccms::Application.routes.draw do
           get :recent
           get :mine
           get :chapters
+          get :sitemap
         end
 
         member do
diff --git a/lib/ccc_conventions.rb b/lib/ccc_conventions.rb
index b420452..352dd3c 100644
--- a/lib/ccc_conventions.rb
+++ b/lib/ccc_conventions.rb
@@ -1,6 +1,7 @@
 module CccConventions
   ERFA_PARENT_NAME       = "club/erfas"
   CHAOSTREFF_PARENT_NAME = "club/chaostreffs"
+  SITEMAP_COLLAPSED_PATHS = %w[updates club/erfas club/chaostreffs disclosure].freeze
 
   NODE_KINDS = {
     "top_level" => {
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index aa8b288..5c1e489 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -25,6 +25,7 @@ a:hover {
    body content, node listing tables, the child-creation shortcuts on
    nodes#show, and the dashboard draft list's Show/Revisions links. */
 #page_editor a,
+#sitemap a,
 table.node_table a,
 table.assets_table a,
 table.events_table a,
@@ -104,6 +105,11 @@ input[type=radio] {
     width: 100%;
     box-sizing: border-box;
   }
+
+  #sitemap details details {
+    margin-left: 0.75rem;
+    padding-left: 0.5rem;
+  }
 }
 
 #metadata,
@@ -773,6 +779,40 @@ form.button_to button[type="submit"] {
   white-space: nowrap;
 }
 
+.sitemap_node {
+  padding-bottom: 0.5rem;
+  margin-bottom: 0.5rem;
+  border-bottom: 1px solid #ececec;
+}
+
+.sitemap_node h4 {
+  margin: 0;
+}
+
+.sitemap_node .field_hint {
+  display: block;
+  margin: 2px 0 0;
+}
+
+.sitemap_node p {
+  margin: 2px 0 0;
+}
+
+#sitemap details details {
+  margin-left: 1.5rem;
+  border-left: 1px solid #e8e8e8;
+  padding-left: 0.75rem;
+}
+
+#sitemap summary {
+  padding: 4px 0;
+}
+
+#sitemap details:not([open]) > summary {
+  color: #ff9600;
+  font-weight: bold;
+}
+
 /* ============================================================
    Page editor / metadata forms
    ============================================================ */
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index 05cb195..b43d2de 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -575,4 +575,56 @@ class NodesControllerTest < ActionController::TestCase
     get :chapters
     assert_select "h1", "Chapters"
   end
+
+  test "sitemap collapses configured paths but leaves others open" do
+    club = Node.root.children.create!(:slug => "club")
+    erfas = club.children.create!(:slug => "erfas")
+    erfas.children.create!(:slug => "one_chapter")
+    other = Node.root.children.create!(:slug => "sitemap_controller_open_test")
+    other.children.create!(:slug => "sitemap_controller_open_child")
+
+    login_as :quentin
+    get :sitemap
+    assert_response :success
+
+    doc = Nokogiri::HTML::DocumentFragment.parse(response.body)
+
+    erfas_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.field_hint')&.text&.include?(erfas.unique_name) }
+    other_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.field_hint')&.text&.include?(other.unique_name) }
+
+    erfas_details = erfas_node_div.next_element
+    other_details = other_node_div.next_element
+
+    assert_equal 'details', erfas_details.name
+    assert_equal 'details', other_details.name
+    assert_not erfas_details.key?('open')
+    assert other_details.key?('open')
+  end
+
+  test "sitemap shows how many descendants a collapsed branch is hiding" do
+    club = Node.root.children.create!(:slug => "club")
+    erfas = club.children.create!(:slug => "erfas")
+    erfas.children.create!(:slug => "one_chapter")
+    erfas.children.create!(:slug => "another_chapter")
+
+    login_as :quentin
+    get :sitemap
+    assert_response :success
+
+    doc = Nokogiri::HTML::DocumentFragment.parse(response.body)
+    erfas_node_div = doc.css('.sitemap_node').find { |div| div.at_css('.field_hint')&.text&.include?(erfas.unique_name) }
+    erfas_details = erfas_node_div.next_element
+
+    assert_equal 'details', erfas_details.name
+    assert_match "2 descendants", erfas_details.at_css('summary').text
+  end
+
+  test "sitemap shows Show and Create Child, not Revisions" do
+    node = Node.root.children.create!(:slug => "sitemap_actions_test")
+    login_as :quentin
+    get :sitemap
+    assert_select ".sitemap_node_actions", :text => /Show/
+    assert_select ".sitemap_node_actions", :text => /Create Child/
+    assert_select ".sitemap_node_actions", :text => /Revisions/, :count => 0
+  end
 end
diff --git a/test/models/helpers/nodes_helper_test.rb b/test/models/helpers/nodes_helper_test.rb
index 5d91a88..5ab924f 100644
--- a/test/models/helpers/nodes_helper_test.rb
+++ b/test/models/helpers/nodes_helper_test.rb
@@ -22,4 +22,15 @@ class NodesHelperTest < ActionView::TestCase
     page = FakePage.new([])
     assert_nil default_event_tag_list(page)
   end
+
+  test "sitemap_node_open? is false for a configured collapsed path" do
+    club = Node.root.children.create!(:slug => "club")
+    erfas = club.children.create!(:slug => "erfas")
+    assert_equal false, sitemap_node_open?(erfas)
+  end
+
+  test "sitemap_node_open? is true for anything not configured as collapsed" do
+    node = Node.root.children.create!(:slug => "sitemap_open_test")
+    assert_equal true, sitemap_node_open?(node)
+  end
 end
-- 
cgit v1.3


From 5803c59192b7fb05840d0b452eb64d9f997f3d8f Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sun, 12 Jul 2026 14:26:30 +0200
Subject: Extract drafts/recent query logic from controller into Node

Node.drafts_and_autosaves and Node.recently_changed replace inline
query logic in NodesController#drafts/#recent -- pure refactor, no
behavior change for either action. The real reason: the dashboard's
upcoming abridged widgets need the exact same queries the full pages
already use, just limited and (for drafts) sorted with the current
user's own locked nodes first. Better to share one method than let a
widget and a full page quietly drift onto two versions of "what counts
as a current draft."

current_user_id: is an explicit, optional argument rather than a
separate method -- ordering by lock ownership only applies when a user
is given; omitted entirely, it's pure recency, exactly today's
behavior. Needed Arel.sql wrapping a sanitized CASE expression before
.order would accept it -- sanitize_sql_array only vouches for the
values inside the string, a separate Rails safety check still refuses
any string shaped like more than a plain column reference unless it's
explicitly marked as already-vetted.
---
 app/controllers/nodes_controller.rb |  9 ++-------
 app/models/node.rb                  | 16 ++++++++++++++++
 test/models/node_test.rb            | 24 ++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 7 deletions(-)

(limited to 'test')

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index 772bf4b..c1468be 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -185,16 +185,11 @@ class NodesController < ApplicationController
 
   # Filter functions for admin views
   def drafts
-    base = Node.where("draft_id IS NOT NULL OR autosave_id IS NOT NULL")
-    @nodes = index_matching(base)
+    @nodes = index_matching(Node.drafts_and_autosaves)
   end
 
   def recent
-    base = Node.where(
-      "nodes.updated_at < ? AND nodes.updated_at > ? AND nodes.parent_id IS NOT NULL",
-      Time.now, Time.now - 14.days
-    )
-    @nodes = index_matching(base)
+    @nodes = index_matching(Node.recently_changed)
   end
 
   def mine
diff --git a/app/models/node.rb b/app/models/node.rb
index 24f3cd0..aa2f7f3 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -367,6 +367,22 @@ class Node < ApplicationRecord
       .distinct
   end
 
+  def self.drafts_and_autosaves(current_user_id: nil)
+    scope = where("draft_id IS NOT NULL OR autosave_id IS NOT NULL")
+    return scope.order("updated_at DESC") unless current_user_id
+
+    scope.order(
+      Arel.sql(sanitize_sql_array(["CASE WHEN locking_user_id = ? THEN 0 ELSE 1 END, updated_at DESC", current_user_id]))
+    )
+  end
+
+  def self.recently_changed
+    where(
+      "nodes.updated_at < ? AND nodes.updated_at > ? AND nodes.parent_id IS NOT NULL",
+      Time.now, Time.now - 14.days
+    )
+  end
+
   protected
     def lock_for! current_user
       self.lock_owner = current_user
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 15e908b..de540f8 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -537,4 +537,28 @@ class NodeTest < ActiveSupport::TestCase
     assert_includes Node.editor_search("Backspace Spiegelgraben"), node
     assert_equal 0, Node.editor_search("Backspace Nonexistentstreet").count
   end
+
+  test "drafts_and_autosaves without a user sorts by recency only" do
+    older = Node.root.children.create!(:slug => "drafts_order_older")
+    older.find_or_create_draft(@user1)
+    newer = Node.root.children.create!(:slug => "drafts_order_newer")
+    newer.find_or_create_draft(@user1)
+
+    result = Node.drafts_and_autosaves.to_a
+    assert result.index(newer) < result.index(older)
+  end
+
+  test "drafts_and_autosaves with a user puts their own locked nodes first, regardless of recency" do
+    mine = Node.root.children.create!(:slug => "drafts_order_mine")
+    mine.lock_for_editing!(@user1)
+    mine.autosave!({:title => "mine"}, @user1)
+
+    someone_elses_newer = Node.root.children.create!(:slug => "drafts_order_theirs")
+    other_user = User.find_by_login("quentin")
+    someone_elses_newer.lock_for_editing!(other_user)
+    someone_elses_newer.autosave!({:title => "theirs"}, other_user)
+
+    result = Node.drafts_and_autosaves(current_user_id: @user1.id).to_a
+    assert result.index(mine) < result.index(someone_elses_newer)
+  end
 end
-- 
cgit v1.3


From 4ec70e5ecf792a56e868538738d6c7f63bb6cf24 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sun, 12 Jul 2026 16:33:12 +0200
Subject: Add a grouped tag+node search endpoint for the upcoming dashboard

AdminController#dashboard_search returns tags and nodes as separate,
labeled groups (via ActsAsTaggableOn::Tag.named_like and
Node.editor_search) rather than the flat per-node list every existing
picker returns. initSearchPicker gains a renderResults callback option
that, when given, replaces the default per-node rendering entirely --
lets the dashboard render its two labeled groups without a second,
parallel picker implementation.

resultsHeaderHtml (the "Press Enter to see all results" hint) is now
threaded through as a third argument to renderResults, so a picker with
custom rendering can still show it -- previously only the default
per-node branch ever did.

Tags link straight to the existing /admin/nodes/tags/:tag view rather
than becoming an in-place filter chip.
---
 app/controllers/admin_controller.rb       |  18 +++++
 app/views/layouts/admin.html.erb          |   1 +
 config/routes.rb                          |   9 +--
 public/javascripts/admin_interface.js     |   4 ++
 public/javascripts/admin_search.js        | 109 +++++++++++++++++++++---------
 public/stylesheets/admin.css              |  10 +++
 test/controllers/admin_controller_test.rb |  24 +++++++
 7 files changed, 139 insertions(+), 36 deletions(-)

(limited to 'test')

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 3c45c49..8445997 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -49,6 +49,24 @@ class AdminController < ApplicationController
     end
   end
 
+  def dashboard_search
+    term = params[:search_term]
+
+    if term.blank?
+      render json: { tags: [], nodes: [] }
+      return
+    end
+
+    render json: {
+      tags: ActsAsTaggableOn::Tag.named_like(term).limit(5).map { |tag|
+        { name: tag.name, tag_path: tags_nodes_path(tags: tag.name) }
+      },
+      nodes: Node.editor_search(term).limit(10).map { |node|
+        { node_id: node.id, title: node.title, unique_name: node.unique_name, node_path: node_path(node) }
+      }
+    }
+  end
+
   def menu_search
     if params[:search_term] == "Root"
       @results = [Node.root]
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 079346b..00d7075 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -17,6 +17,7 @@
       var ADMIN_SEARCH_URL = "<%= admin_search_path %>";
       var ADMIN_MENU_SEARCH_URL = "<%= admin_menu_search_path %>";
       var PARAMETERIZE_PREVIEW_URL = "<%= parameterize_preview_nodes_path %>";
+      var DASHBOARD_SEARCH_URL = "<%= admin_dashboard_search_path %>";
     </script>
   </head>
   
diff --git a/config/routes.rb b/config/routes.rb
index bb34bd8..92301e5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -66,10 +66,11 @@ Cccms::Application.routes.draw do
         end
       end
 
-      match ''            => 'admin#index',        :as => :admin,             :via => :get
-      match 'search'      => 'admin#search',       :as => :admin_search,      :via => :get
-      match 'menu_search' => 'admin#menu_search',  :as => :admin_menu_search, :via => :get
-      match 'conventions' => 'admin#conventions',  :as => :admin_conventions, :via => :get
+      match ''                 => 'admin#index',            :as => :admin,                  :via => :get
+      match 'search'           => 'admin#search',           :as => :admin_search,           :via => :get
+      match 'menu_search'      => 'admin#menu_search',      :as => :admin_menu_search,      :via => :get
+      match 'conventions'      => 'admin#conventions',      :as => :admin_conventions,      :via => :get
+      match 'dashboard_search' => 'admin#dashboard_search', :as => :admin_dashboard_search, :via => :get
     end
 
     match '/logout'      => 'sessions#destroy', :as => :logout,       :via => :delete
diff --git a/public/javascripts/admin_interface.js b/public/javascripts/admin_interface.js
index 8ca5b5e..3f6a0a9 100644
--- a/public/javascripts/admin_interface.js
+++ b/public/javascripts/admin_interface.js
@@ -31,6 +31,10 @@ $(document).ready(function () {
     }
   });
 
+  if ($("#dashboard_search_term").length != 0) {
+    dashboard_search.initialize();
+  }
+
   if ($("#menu_search_term").length != 0) {
     menu_items.initialize_search();
   }
diff --git a/public/javascripts/admin_search.js b/public/javascripts/admin_search.js
index f553334..53bcb5e 100644
--- a/public/javascripts/admin_search.js
+++ b/public/javascripts/admin_search.js
@@ -42,9 +42,10 @@ function initSearchPicker(options) {
   var inputSelector = options.inputSelector;
   var resultsSelector = options.resultsSelector;
   var url = options.url || ADMIN_MENU_SEARCH_URL;
-  var onSelect = options.onSelect;               // omit for a real-navigation search like admin_search
-  var isActive = options.isActive;                 // optional guard, checked before every search
+  var onSelect = options.onSelect;                   // omit for a real-navigation search like admin_search
+  var isActive = options.isActive;                   // optional guard, checked before every search
   var resultsHeaderHtml = options.resultsHeaderHtml; // optional, prepended only when results exist
+  var renderResults = options.renderResults;         // optional, replaces the default per-node rendering entirely
   var requestId = 0;
   var timeout;
 
@@ -68,39 +69,44 @@ function initSearchPicker(options) {
         url: url,
         data: "search_term=" + term,
         dataType: "json",
-        success: function(nodes) {
+        success: function(data) {
           if (thisRequest !== requestId) return;
           results.empty();
-          if (nodes.length && resultsHeaderHtml) {
-            results.append(resultsHeaderHtml);
-          }
-          var found = false;
-          for (var i = 0; i < nodes.length; i++) {
-            (function(node) {
-              var link;
-              if (onSelect) {
-                link = $(
-                  "<p><a href='#'>" + node.title +
-                    "<span class='result_path'>" + node.unique_name + "</span>" +
-                  "</a></p>"
-                );
-                link.find("a").bind("click", function() {
-                  onSelect(node);
-                  results.slideUp();
-                  results.empty();
-                  return false;
-                });
-              } else {
-                link = $(
-                  "<p><a href='" + node.node_path + "'>" + node.title +
-                    "<span class='result_path'>" + node.unique_name + "</span>" +
-                  "</a></p>"
-                );
-              }
-              results.append(link);
-              found = true;
-            })(nodes[i]);
+
+          var found;
+          if (renderResults) {
+            found = renderResults(data, results, resultsHeaderHtml);
+          } else {
+            if (data.length && resultsHeaderHtml) {
+              results.append(resultsHeaderHtml);
+            }
+            found = false;
+            for (var i = 0; i < data.length; i++) {
+              (function(node) {
+                var link;
+                if (onSelect) {
+                  link = $(
+                    "<p><a href='#'>" + node.title +
+                      "<span class='result_path'>" + node.unique_name + "</span></a></p>"
+                  );
+                  link.find("a").bind("click", function() {
+                    onSelect(node);
+                    results.slideUp();
+                    results.empty();
+                    return false;
+                  });
+                } else {
+                  link = $(
+                    "<p><a href='" + node.node_path + "'>" + node.title +
+                      "<span class='result_path'>" + node.unique_name + "</span></a></p>"
+                  );
+                }
+                results.append(link);
+                found = true;
+              })(data[i]);
+            }
           }
+
           if (found) {
             results.slideDown();
           } else {
@@ -115,6 +121,45 @@ function initSearchPicker(options) {
   });
 }
 
+dashboard_search = {
+  initialize : function() {
+    initSearchPicker({
+      inputSelector: "#dashboard_search_term",
+      resultsSelector: "#dashboard_search_results",
+      url: DASHBOARD_SEARCH_URL,
+      resultsHeaderHtml: "<p class='search_more'>Press Enter to see all results ⏎</p>",
+      renderResults: function(data, results, resultsHeaderHtml) {
+        var found = false;
+
+        if ((data.tags.length || data.nodes.length) && resultsHeaderHtml) {
+          results.append(resultsHeaderHtml);
+        }
+
+        if (data.tags.length) {
+          results.append("<p class='search_group_label'>Tags</p>");
+          data.tags.forEach(function(tag) {
+            results.append("<p><a href='" + tag.tag_path + "'>" + tag.name + "</a></p>");
+            found = true;
+          });
+        }
+
+        if (data.nodes.length) {
+          results.append("<p class='search_group_label'>Pages</p>");
+          data.nodes.forEach(function(node) {
+            results.append(
+              "<p><a href='" + node.node_path + "'>" + node.title +
+                "<span class='result_path'>" + node.unique_name + "</span></a></p>"
+            );
+            found = true;
+          });
+        }
+
+        return found;
+      }
+    });
+  }
+};
+
 menu_items = {
   initialize_search : function() {
     initSearchPicker({
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index da31535..ade3a62 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -1052,6 +1052,16 @@ div#draft_list table td.actions a {
   border-bottom: none;
 }
 
+.search_results p.search_group_label {
+  margin: 8px 0 2px;
+  padding: 0;
+  border-bottom: none;
+  font-size: 0.75rem;
+  color: #969696;
+  text-transform: lowercase;
+  font-weight: normal;
+}
+
 /* ============================================================
    Menu items (navigation editor)
    ============================================================ */
diff --git a/test/controllers/admin_controller_test.rb b/test/controllers/admin_controller_test.rb
index 13cc1bb..9beaf58 100644
--- a/test/controllers/admin_controller_test.rb
+++ b/test/controllers/admin_controller_test.rb
@@ -34,4 +34,28 @@ class AdminControllerTest < ActionController::TestCase
     matches = assigns(:mynodes).select { |n| n.id == node.id }
     assert_equal 1, matches.length
   end
+
+  test "dashboard_search returns matching tags and nodes grouped separately" do
+    node = Node.root.children.create!(:slug => "dashboard_search_test")
+    node.find_or_create_draft(User.find_by_login("aaron"))
+    node.draft.update(:title => "Biometrics Workshop")
+    node.draft.tag_list = "biometrics-workshop"
+    node.draft.save!
+
+    login_as :quentin
+    get :dashboard_search, params: { :search_term => "biometr" }, :format => :json
+
+    json = JSON.parse(response.body)
+    assert json["tags"].any? { |t| t["name"] == "biometrics-workshop" }
+    assert json["nodes"].any? { |n| n["title"] == "Biometrics Workshop" }
+  end
+
+  test "dashboard_search returns empty results for a blank term" do
+    login_as :quentin
+    get :dashboard_search, params: { :search_term => "" }, :format => :json
+
+    json = JSON.parse(response.body)
+    assert_equal [], json["tags"]
+    assert_equal [], json["nodes"]
+  end
 end
-- 
cgit v1.3


From cf93acb8ad44ba9cd486e8f6457d9fd9fbc041cc Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sun, 12 Jul 2026 23:42:23 +0200
Subject: Add a locale-aware relative-time helper; drop stale locale overrides

Node.recently_changed and the new dashboard need "X ago" rendered
correctly in both locales. Rails' own distance_of_time_in_words/
time_ago_in_words can't do this on their own -- the scope option
changes which translation key is looked up, not the underlying
grammar, and German's "vor" requires dative case, which is a
different word form than the nominative plural Rails computes by
default. relative_time_phrase/relative_distance is a small, from-
scratch bucketing helper instead, with an explicit, hand-checked
translation table per unit per locale.

Also removes de.yml's datetime.distance_in_words and activerecord.
errors blocks. Both used the old {{count}}/{{model}} interpolation
syntax the current i18n gem no longer recognizes -- it silently
leaves the literal placeholder text in the rendered output rather
than erroring, which is why this went unnoticed until now. Both were
shadowing rails-i18n's own current, correct translations for exactly
these keys; deleting the local override lets the gem's version take
over instead of maintaining a second, broken copy.
---
 app/helpers/datetime_helper.rb              | 53 ++++++++++++++++++++++
 config/locales/de.yml                       | 70 ++---------------------------
 config/locales/en.yml                       |  4 ++
 test/models/helpers/datetime_helper_test.rb | 19 ++++++++
 4 files changed, 80 insertions(+), 66 deletions(-)
 create mode 100644 app/helpers/datetime_helper.rb
 create mode 100644 test/models/helpers/datetime_helper_test.rb

(limited to 'test')

diff --git a/app/helpers/datetime_helper.rb b/app/helpers/datetime_helper.rb
new file mode 100644
index 0000000..8497b1c
--- /dev/null
+++ b/app/helpers/datetime_helper.rb
@@ -0,0 +1,53 @@
+module DatetimeHelper
+
+  def relative_distance(time, now = Time.current)
+    seconds = (now - time).abs
+
+    case seconds
+    when 0...90
+      [1, :minute]
+    when 90...45.minutes
+      [(seconds / 60).round, :minute]
+    when 45.minutes...24.hours
+      [(seconds / 1.hour).round, :hour]
+    when 24.hours...30.days
+      [(seconds / 1.day).round, :day]
+    when 30.days...365.days
+      [(seconds / 30.days).round, :month]
+    else
+      [(seconds / 365.days).round, :year]
+    end
+  end
+
+  RELATIVE_TIME_UNIT_FORMS = {
+    en: {
+      minute: { one: "minute", other: "minutes" },
+      hour:   { one: "hour",   other: "hours" },
+      day:    { one: "day",    other: "days" },
+      month:  { one: "month",  other: "months" },
+      year:   { one: "year",   other: "years" },
+    },
+    de: {
+      # "other" here is the DATIVE plural needed after "vor" -- not the
+      # nominative plural you'd use standing alone ("3 Tage" vs "vor 3
+      # Tagen"). All five happen to be the nominative plural + "n", since
+      # none of them already end in -n or -s -- a property of these five
+      # specific words, not a rule to extend to new units without checking.
+      minute: { one: "Minute", other: "Minuten" },
+      hour:   { one: "Stunde", other: "Stunden" },
+      day:    { one: "Tag",    other: "Tagen" },
+      month:  { one: "Monat",  other: "Monaten" },
+      year:   { one: "Jahr",   other: "Jahren" },
+    },
+  }.freeze
+
+  def relative_time_phrase(time, now = Time.current)
+    count, unit = relative_distance(time, now)
+    locale = I18n.locale.to_sym
+    forms = RELATIVE_TIME_UNIT_FORMS.fetch(locale, RELATIVE_TIME_UNIT_FORMS[:en])
+    word = forms.fetch(unit).fetch(count == 1 ? :one : :other)
+
+    locale == :de ? "vor #{count} #{word}" : "#{count} #{word} ago"
+  end
+
+end
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 1f2222c..550ccb3 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -14,6 +14,10 @@ de:
   open_days_label: "Offene Tage"
   upcoming_events: "Weitere Termine"
   open_today: "Das Chaos, lokal und heute offen"
+  published: "veröffentlicht"
+  published_by: "veröffentlicht durch %{editor}"
+  editor_self: "du"
+  publisher_self: "dich"
   date:
     formats:
       default: "%d.%m.%Y"
@@ -29,7 +33,6 @@ de:
       - :day
       - :month
       - :year
-
   time:
     formats:
       default: "%A, %e. %B %Y, %H:%M Uhr"
@@ -41,42 +44,6 @@ de:
     am: "vormittags"
     pm: "nachmittags"
 
-  datetime:
-    distance_in_words:
-      half_a_minute: 'eine halbe Minute'
-      less_than_x_seconds:
-        zero: 'weniger als 1 Sekunde'
-        one: 'weniger als 1 Sekunde'
-        other: 'weniger als {{count}} Sekunden'
-      x_seconds:
-        one: '1 Sekunde'
-        other: '{{count}} Sekunden'
-      less_than_x_minutes:
-        zero: 'weniger als 1 Minute'
-        one: 'weniger als eine Minute'
-        other: 'weniger als {{count}} Minuten'
-      x_minutes:
-        one: '1 Minute'
-        other: '{{count}} Minuten'
-      about_x_hours:
-        one: 'etwa 1 Stunde'
-        other: 'etwa {{count}} Stunden'
-      x_days:
-        one: '1 Tag'
-        other: '{{count}} Tage'
-      about_x_months:
-        one: 'etwa 1 Monat'
-        other: 'etwa {{count}} Monate'
-      x_months:
-        one: '1 Monat'
-        other: '{{count}} Monate'
-      about_x_years:
-        one: 'etwa 1 Jahr'
-        other: 'etwa {{count}} Jahre'
-      over_x_years:
-        one: 'mehr als 1 Jahr'
-        other: 'mehr als {{count}} Jahre'
-
   number:
     format:
       precision: 2
@@ -105,35 +72,6 @@ de:
       sentence_connector: "und"
       skip_last_comma: true
 
-  activerecord:
-    errors:
-      template:
-        header:
-          one: 1 error prohibited this {{model}} from being saved
-          other: "{{count}} errors prohibited this {{model}} from being saved"
-        body: "There were problems with the following fields:"
-
-      messages:
-        inclusion: "is not included in the list"
-        exclusion: "is reserved"
-        invalid: "is invalid"
-        confirmation: "doesn't match confirmation"
-        accepted: "must be accepted"
-        empty: "can't be empty"
-        blank: "can't be blank"
-        too_long: "is too long (maximum is {{count}} characters)"
-        too_short: "is too short (minimum is {{count}} characters)"
-        wrong_length: "is the wrong length (should be {{count}} characters)"
-        taken: "has already been taken"
-        not_a_number: "is not a number"
-        greater_than: "must be greater than {{count}}"
-        greater_than_or_equal_to: "must be greater than or equal to {{count}}"
-        equal_to: "must be equal to {{count}}"
-        less_than: "must be less than {{count}}"
-        less_than_or_equal_to: "must be less than or equal to {{count}}"
-        odd: "must be odd"
-        even: "must be even"
-
   will_paginate:
     previous_label: "&#8592; Zurück"
     previous_aria_label: "Vorherige Seite"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 59c7304..73271ed 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -15,6 +15,10 @@ en:
   open_days_label: "Open days"
   upcoming_events: "Upcoming events"
   open_today: "Open today"
+  published: "published"
+  published_by: "published by %{editor}"
+  publisher_self: "you"
+  editor_self: "you"
 
   time:
     formats:
diff --git a/test/models/helpers/datetime_helper_test.rb b/test/models/helpers/datetime_helper_test.rb
new file mode 100644
index 0000000..a24e5d3
--- /dev/null
+++ b/test/models/helpers/datetime_helper_test.rb
@@ -0,0 +1,19 @@
+require 'test_helper'
+
+class DatetimeHelperTest < ActionView::TestCase
+  test "relative_time_phrase pluralizes correctly in English and German" do
+    travel_to Time.zone.parse("2026-07-12 12:00:00") do
+      I18n.with_locale(:en) do
+        assert_equal "1 day ago", relative_time_phrase(1.day.ago)
+        assert_equal "3 days ago", relative_time_phrase(3.days.ago)
+      end
+      I18n.with_locale(:de) do
+        assert_equal "vor 1 Tag", relative_time_phrase(1.day.ago)
+        assert_equal "vor 3 Tagen", relative_time_phrase(3.days.ago)
+        assert_equal "vor 1 Monat", relative_time_phrase(30.days.ago)
+        assert_equal "vor 2 Monaten", relative_time_phrase(45.days.ago)
+        assert_equal "vor 2 Jahren", relative_time_phrase(2.years.ago)
+      end
+    end
+  end
+end
-- 
cgit v1.3


From b271648f89cba7cafafa1b73b1658b1c1bc0e4b0 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sun, 12 Jul 2026 23:42:43 +0200
Subject: Rebuild the admin dashboard: icon nav, search, signposts, widgets

Replaces the old admin#index wizard -- accreted over years, never
designed as a whole -- with the dashboard settled on this session:
a three-icon nav (dashboard/search/log out, no locale selector), a
nodes-first search bar, four task signposts, and two symmetric
widgets (drafts/autosaves, recent changes) with a quiet housekeeping
row beneath them.

Node.recently_changed now filters and orders by the head page's own
updated_at instead of the node's blanket timestamp, so a lock/unlock
cycle with no actual publish no longer surfaces here, and the
original publisher is no longer misattributed to someone else's
housekeeping action. This also restores the "published" qualifier on
each entry, which the query previously couldn't guarantee was true.

@mynodes and its dedicated "My Work" table are retired along with the
old wizard -- "Continue my work" is a link to the existing, already-
correct NodesController#mine instead of a second, duplicate query.
Its one dedicated test (dedup across multiple revisions by the same
user) is ported to nodes_controller_test.rb, since mine already
carries the same .distinct protection the old query did; it just had
no test of its own until now.
---
 app/controllers/admin_controller.rb       |  21 +--
 app/helpers/nodes_helper.rb               |  12 ++
 app/models/node.rb                        |   6 +-
 app/views/admin/_menu.html.erb            |  14 +-
 app/views/admin/index.html.erb            | 210 ++++++++++--------------------
 test/controllers/admin_controller_test.rb |  20 ---
 test/controllers/nodes_controller_test.rb |  20 +++
 test/models/node_test.rb                  |  24 ++++
 8 files changed, 134 insertions(+), 193 deletions(-)

(limited to 'test')

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 8445997..37fd78b 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -5,25 +5,8 @@ class AdminController < ApplicationController
   before_action :login_required
 
   def index
-    @drafts = Node.where("draft_id IS NOT NULL OR autosave_id IS NOT NULL")
-      .limit(50).order("updated_at desc")
-
-    @drafts_count = Node.where("draft_id IS NOT NULL OR autosave_id IS NOT NULL").count
-
-    @recent_changes = Node.where(
-      "updated_at < ? AND updated_at > ? AND parent_id IS NOT NULL",
-      Time.now, Time.now - 14.days
-    ).limit(50).order("updated_at desc")
-
-    ordered_with_level = Node.root.self_and_descendants_ordered_with_level
-    @sitemap_depth = {}
-    ordered_with_level.each { |node, level| @sitemap_depth[node.id] = level }
-    @sitemap = ordered_with_level.map(&:first).reject(&:update?)
-
-    @mynodes = Node.joins(:pages)
-          .where("pages.user_id = ? or pages.editor_id = ?", current_user, current_user)
-          .order("updated_at desc")
-          .distinct.first(50)
+    @drafts = Node.drafts_and_autosaves(current_user_id: current_user.id).limit(5)
+    @recent_changes = Node.recently_changed.limit(5)
   end
 
   def conventions
diff --git a/app/helpers/nodes_helper.rb b/app/helpers/nodes_helper.rb
index 1268b63..5884c8c 100644
--- a/app/helpers/nodes_helper.rb
+++ b/app/helpers/nodes_helper.rb
@@ -28,6 +28,18 @@ module NodesHelper
     User.all.map {|u| [u.login, u.id]}
   end
 
+  def node_last_editor(node)
+    editor = node.draft&.editor || node.head&.editor
+    return nil unless editor
+    editor == current_user ? t("editor_self") : editor.login
+  end
+
+  def node_head_editor(node)
+    editor = node.head&.editor
+    return nil unless editor
+    editor == current_user ? t("publisher_self") : editor.login
+  end
+
   DEFAULT_EVENT_TAG_BY_PAGE_TAG = {
     'erfa-detail'       => 'open-day',
     'chaostreff-detail' => 'open-day'
diff --git a/app/models/node.rb b/app/models/node.rb
index aa2f7f3..1d0a089 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -377,10 +377,10 @@ class Node < ApplicationRecord
   end
 
   def self.recently_changed
-    where(
-      "nodes.updated_at < ? AND nodes.updated_at > ? AND nodes.parent_id IS NOT NULL",
+    includes(:head).where(
+      "pages.updated_at < ? AND pages.updated_at > ? AND nodes.parent_id IS NOT NULL",
       Time.now, Time.now - 14.days
-    )
+    ).order("pages.updated_at desc").references(:head)
   end
 
   protected
diff --git a/app/views/admin/_menu.html.erb b/app/views/admin/_menu.html.erb
index 4302987..970429d 100644
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -1,9 +1,5 @@
-<%= language_selector %>
-<%= button_to 'Logout', logout_path, method: :delete %>
-<%= link_to 'Overview', admin_path %>
-<a href="#" onclick="admin_search.display_toggle(); return false;">search</a>
-<%= link_to 'Nodes', nodes_path, selected?('nodes') %>
-<%= link_to 'Assets', assets_path, selected?('assets') %>
-<%= link_to 'Events', events_path, selected?('events') %>
-<%= link_to 'User', users_path, selected?('users') %>
-<%= link_to 'Navigation', menu_items_path, selected?('menu_items') %>
+<%= link_to icon("home", library: "tabler", "aria-hidden": true), admin_path, "aria-label": "Dashboard" %>
+<a href="#" onclick="admin_search.display_toggle(); return false;" aria-label="Search"><%= icon("search", library: "tabler", "aria-hidden": true) %></a>
+<%= button_to logout_path, method: :delete, aria: { label: "Log out" } do %>
+  <%= icon("logout", library: "tabler", "aria-hidden": true) %>
+<% end %>
diff --git a/app/views/admin/index.html.erb b/app/views/admin/index.html.erb
index c67ccb3..bdb555e 100644
--- a/app/views/admin/index.html.erb
+++ b/app/views/admin/index.html.erb
@@ -1,155 +1,81 @@
-<div id="admin_wizard">
-  <h2>Quick links</h2>
-  <div class="admin_wizard_button"><%= link_to 'Create post or page', new_node_path, :only_path => false %></div>
-  <div class="admin_wizard_button"><a href="#" id="admin_wizard_my_work" class="button">Continue my work</a></div>
-  <div class="admin_wizard_button"><a href="#" id="admin_wizard_create_page" class="button">Add a page in the page tree</a></div>
-  <div class="admin_wizard_button"><%= link_to("Upload a new asset", new_asset_path, :only_path => false) %></div>
+<h1>cccms dashboard</h1>
+<div id="dashboard_search">
+  <%= form_tag admin_search_path, method: :get do %>
+    <%= text_field_tag :search_term, nil, id: "dashboard_search_term", placeholder: "Search nodes and tags…", autocomplete: "off" %>
+  <% end %>
+  <div id="dashboard_search_results" class="search_results"></div>
 </div>
 
-<p id="overview_toggle">
-  <a href="#" id="recent_changes_toggle" class="button">recent changes</a>
-  <a href="#" id="my_work_toggle" class="button">my work</a>
-  <a href="#" id="current_drafts_toggle" class="button">current drafts (<%= @drafts_count %>)</a>
-  <a href="#" id="admin_sitemap_toggle" class="button">site map</a>
-</p>
+<div id="dashboard_signposts" class="button_row">
+  <%= link_to new_node_path, class: "action_button" do %>
+    <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create post
+  <% end %>
+  <%= link_to chapters_nodes_path, class: "action_button" do %>
+    <%= icon("map-pin", library: "tabler", "aria-hidden": true) %> Find a chapter
+  <% end %>
+  <%= link_to new_asset_path, class: "action_button" do %>
+    <%= icon("upload", library: "tabler", "aria-hidden": true) %> Upload asset
+  <% end %>
+  <%= link_to sitemap_nodes_path, class: "action_button" do %>
+    <%= icon("list-tree", library: "tabler", "aria-hidden": true) %> Add a page in the page tree
+  <% end %>
+</div>
 
-<div id="recent_changes_table">
-  
-  <h2>Recent Changes</h2>
+<div id="dashboard_widgets">
+  <div class="dashboard_widget">
+    <h3>Drafts and autosaves</h3>
+    <ul>
+      <% @drafts.each do |node| %>
+        <li>
+          <div>
+            <%= link_to title_for_node(node), node_path(node) %>
+            <span class="field_hint"><%= link_to_path("#{node.unique_name} ↗", node.unique_name) %></span>
+          </div>
+          <span class="dashboard_widget_meta">
+            <% if (editor = node_last_editor(node)) %><%= editor %>, <% end %><%= relative_time_phrase(node.updated_at) %>
+          </span>
+        </li>
+      <% end %>
+    </ul>
+    <%= link_to "See all drafts →", drafts_nodes_path %>
+  </div>
 
-  <table class="node_table">
-    <tr class="header">
-      <th class="node_id">ID</th>
-      <th class="title">Title</th>
-      <th class="actions">Actions</th>
-      <th class="editor">Locked by</th>
-      <th class="revision">Rev.</th>
-    </tr>
+  <div class="dashboard_widget">
+    <h3>Recent changes</h3>
+    <ul>
     <% @recent_changes.each do |node| %>
-    <tr class="<%= cycle("even", "odd") %>">
-      <td class="node_id"><%= node.id %></td>
-      <td class="title">
-        <h4><%= link_to title_for_node(node), node_path(node) %></h4>
-        <p><%= link_to_path(node.unique_name, node.unique_name) %></p>
-      </td>
-      <td class="actions">
-        <%= link_to 'show',      node_path(node) %>
-        <%= link_to 'Revisions', node_revisions_path(node) %>
-      </td>
-      <td>
-        <%= node.lock_owner.login if node.lock_owner %>
-      </td>
-      <td>
-        <%= link_to ( node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY" ) ), node_revisions_path(node) %>
-      </td>
-    </tr>
+      <li>
+        <div>
+          <%= link_to title_for_node(node), node_path(node) %>
+          <span class="field_hint"><%= link_to_path("#{node.unique_name} ↗", node.unique_name) %></span>
+        </div>
+        <span class="dashboard_widget_meta">
+          <%= (editor = node_head_editor(node)) ? t("published_by", editor: editor) : t("published") %>, <%= relative_time_phrase(node.head.updated_at) %>
+        </span>
+      </li>
     <% end %>
-  </table>
+    </ul>
+    <%= link_to "See all recent changes →", recent_nodes_path %>
+  </div>
 </div>
 
-<div id="my_work_table">
-  
-  <h2>My Work</h2>
-
-  <table class="node_table">
-    <tr class="header">
-      <th class="node_id">ID</th>
-      <th class="title">Title</th>
-      <th class="actions">Actions</th>
-      <th class="editor">Locked by</th>
-      <th class="revision">Rev.</th>
-    </tr>
-    <% @mynodes.each do |node| %>
-    <tr class="<%= cycle("even", "odd") %>">
-      <td class="node_id"><%= node.id %></td>
-      <td class="title">
-        <h4><%= link_to title_for_node(node), node_path(node) %></h4>
-        <p><%= link_to_path(node.unique_name, node.unique_name) %></p>
-      </td>
-      <td class="actions">
-        <%= link_to 'show',      node_path(node) %>
-        <%= link_to 'Revisions', node_revisions_path(node) %>
-      </td>
-      <td>
-        <%= node.lock_owner.login if node.lock_owner %>
-      </td>
-      <td>
-        <%= link_to ( node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY" ) ), node_revisions_path(node) %>
-      </td>
-    </tr>
+<div id="dashboard_housekeeping">
+  <h3>Housekeeping</h3>
+  <div class="button_row">
+    <%= link_to nodes_path, class: "action_button" do %>
+      <%= icon("list", library: "tabler", "aria-hidden": true) %> Nodes
     <% end %>
-  </table>
-</div>
-
-<div id="current_drafts_table">
-
-  <h2>Current Drafts & Autosaves (<%= @drafts_count %>)</h2>
-
-  <table class="node_table">
-    <tr class="header">
-      <th class="node_id">ID</th>
-      <th class="title">Title</th>
-      <th class="actions">Actions</th>
-      <th class="editor">Locked by</th>
-      <th class="revision">Rev.</th>
-      <th class="autosave">Autosave</th>
-    </tr>
-    <% @drafts.each do |node| %>
-    <tr class="<%= cycle("even", "odd") %>">
-      <td class="node_id"><%= node.id %></td>
-      <td class="title">
-        <h4><%= link_to title_for_node(node), node_path(node) %></h4>
-        <p><%= link_to_path(node.unique_name, node.unique_name) %></p>
-      </td>
-      <td class="actions">
-        <%= link_to 'show',      node_path(node) %>
-        <%= link_to 'Revisions', node_revisions_path(node) %>
-        <% if pair = node.available_layer_pairs.last %>
-          <%= link_to 'diff', diff_node_revisions_path(node, start_revision: pair.first, end_revision: pair.last) %>
-        <% end %>
-      </td>
-      <td>
-        <%= node.lock_owner.login if node.lock_owner %>
-      </td>
-      <td>
-        <%= link_to ( node.draft ? node.draft.revision : (node.head ? node.head.revision : "EMPTY" ) ), node_revisions_path(node) %>
-      </td>
-      <td class="autosave">
-        <%= node.autosave ? "unsaved changes" : "" %>
-      </td>
-    </tr>
+    <%= link_to events_path, class: "action_button" do %>
+      <%= icon("calendar", library: "tabler", "aria-hidden": true) %> Events
     <% end %>
-  </table>
-</div>
-
-<div id="admin_sitemap_table">
-
-  <h2>Sitemap</h2>
-
-  <table class="node_table">
-    <tr class="header">
-      <th class="node_id">ID</th>
-      <th class="title">Title</th>
-      <th class="actions">Actions</th>
-      <th class="editor">Locked by</th>
-    </tr>
-    <% @sitemap.each do |node| %>
-    <% if !node.nil? %>
-      <tr class="<%= cycle("even", "odd") %>">
-      <td class="node_id" style="padding-left: <%= @sitemap_depth[node.id] * 30 %>px;"><%= node.id %></td>
-      <td class="title"  style="padding-left: <%= @sitemap_depth[node.id] * 30 %>px;">
-        <h4><%= link_to title_for_node(node), node_path(node) %></h4>
-        <p><%= link_to_path(node.unique_name, node.unique_name) %></p>
-      </td>
-      <td class="actions">
-        <%= link_to 'create subpage', new_node_path(:parent_id => node.id) %>
-        <%= link_to 'Revisions',      node_revisions_path(node) %>
-      </td>
-      <td>
-        <%= node.lock_owner.login if node.lock_owner %>
-      </td>
-    </tr>
+    <%= link_to assets_path, class: "action_button" do %>
+      <%= icon("folder", library: "tabler", "aria-hidden": true) %> Assets
+    <% end %>
+    <%= link_to users_path, class: "action_button" do %>
+      <%= icon("users", library: "tabler", "aria-hidden": true) %> Users
     <% end %>
+    <%= link_to menu_items_path, class: "action_button" do %>
+      <%= icon("menu-2", library: "tabler", "aria-hidden": true) %> Navigation
     <% end %>
-  </table>
+  </div>
 </div>
diff --git a/test/controllers/admin_controller_test.rb b/test/controllers/admin_controller_test.rb
index 9beaf58..00a51e2 100644
--- a/test/controllers/admin_controller_test.rb
+++ b/test/controllers/admin_controller_test.rb
@@ -15,26 +15,6 @@ class AdminControllerTest < ActionController::TestCase
     assert_includes assigns(:drafts), node
   end
 
-  test "my work list shows each matching node only once, even with several revisions by the same user" do
-    login_as :quentin
-    user = User.find_by_login("quentin")
-    node = Node.root.children.create!(:slug => "dedup_test")
-    node.lock_for_editing!(user)
-    node.autosave!({:title => "v1"}, user)
-    node.save_draft!(user)
-    node.publish_draft!
-    node.lock_for_editing!(user)
-    node.autosave!({:title => "v2"}, user)
-    node.save_draft!(user)
-    node.publish_draft!
-    # three pages now exist on this node, all touched by quentin --
-    # without DISTINCT, the join would return this node three times
-
-    get :index
-    matches = assigns(:mynodes).select { |n| n.id == node.id }
-    assert_equal 1, matches.length
-  end
-
   test "dashboard_search returns matching tags and nodes grouped separately" do
     node = Node.root.children.create!(:slug => "dashboard_search_test")
     node.find_or_create_draft(User.find_by_login("aaron"))
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb
index b43d2de..81e3f45 100644
--- a/test/controllers/nodes_controller_test.rb
+++ b/test/controllers/nodes_controller_test.rb
@@ -521,6 +521,26 @@ class NodesControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  test "mine shows each matching node only once, even with several revisions by the same user" do
+    login_as :quentin
+    user = User.find_by_login("quentin")
+    node = Node.root.children.create!(:slug => "dedup_test")
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v1"}, user)
+    node.save_draft!(user)
+    node.publish_draft!
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v2"}, user)
+    node.save_draft!(user)
+    node.publish_draft!
+    # three pages now exist on this node, all touched by quentin --
+    # without DISTINCT, the join would return this node three times
+
+    get :mine
+    matches = assigns(:nodes).select { |n| n.id == node.id }
+    assert_equal 1, matches.length
+  end
+
   test "chapters combined with a search term does not raise an ambiguous column error" do
     login_as :quentin
     get :chapters, params: { :q => "Zombies" }
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index de540f8..0bce222 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -561,4 +561,28 @@ class NodeTest < ActiveSupport::TestCase
     result = Node.drafts_and_autosaves(current_user_id: @user1.id).to_a
     assert result.index(mine) < result.index(someone_elses_newer)
   end
+
+  test "recently_changed includes a node whose head was recently published" do
+    node = Node.root.children.create!(:slug => "recent_changed_published")
+    node.find_or_create_draft(@user1)
+    node.autosave!({:title => "v1"}, @user1)
+    node.save_draft!(@user1)
+    node.publish_draft!
+
+    assert_includes Node.recently_changed, node
+  end
+
+  test "recently_changed excludes a node only touched by locking or unlocking after an old publish" do
+    node = Node.root.children.create!(:slug => "recent_changed_lock_only")
+    node.find_or_create_draft(@user1)
+    node.autosave!({:title => "v1"}, @user1)
+    node.save_draft!(@user1)
+    node.publish_draft!
+    node.head.update_column(:updated_at, 20.days.ago)
+
+    node.lock_for_editing!(@user1)
+    node.unlock!
+
+    assert_not_includes Node.recently_changed, node
+  end
 end
-- 
cgit v1.3


From 848ce18303f927bfadaf0965a769cae2c62492a0 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Sun, 12 Jul 2026 23:43:02 +0200
Subject: Normalize action-button wording and add icons app-wide

"New X" becomes "Create X" throughout (users, events, assets, menu
items, nodes), matching the verb-first pattern the dashboard's own
signposts already established, with a shared plus icon rather than a
document-flavored one that only made sense next to "post". The
"Destroy"/"destroy"/"Delete" family is normalized to "Destroy"
everywhere, with a shared trash icon; occurrences#index and
pages#index also pick up the destructive button class they'd been
silently missing. Filter and Search convert from submit_tag to
button_tag, the only way either can hold an icon alongside its label.

Edit and the node editor's three dynamic labels (Continue Editing /
Edit Draft / Lock + Edit) share one icon without touching their
wording -- unlike Destroy's family, the state nuance in the text is
real information, not just inconsistent phrasing.
---
 app/views/assets/index.html.erb           |  8 ++++++--
 app/views/assets/show.html.erb            |  4 +++-
 app/views/events/edit.html.erb            |  6 ++++--
 app/views/events/index.html.erb           |  8 ++++++--
 app/views/events/show.html.erb            |  8 ++++++--
 app/views/events/without_node.html.erb    |  4 +++-
 app/views/menu_items/index.html.erb       | 11 +++++++----
 app/views/nodes/_node_list.html.erb       |  4 +++-
 app/views/nodes/chapters.html.erb         |  6 ++++--
 app/views/nodes/edit.html.erb             |  8 +++++---
 app/views/nodes/index.html.erb            |  4 +++-
 app/views/nodes/show.html.erb             | 15 ++++++++++-----
 app/views/occurrences/index.html.erb      |  4 +++-
 app/views/pages/index.html.erb            |  4 +++-
 app/views/revisions/diff.html.erb         | 10 ++++++----
 app/views/users/_user.html.erb            |  7 ++++---
 app/views/users/index.html.erb            |  8 ++++++--
 app/views/users/show.html.erb             |  4 +++-
 test/controllers/users_controller_test.rb |  2 +-
 19 files changed, 86 insertions(+), 39 deletions(-)

(limited to 'test')

diff --git a/app/views/assets/index.html.erb b/app/views/assets/index.html.erb
index 6591091..8c35561 100644
--- a/app/views/assets/index.html.erb
+++ b/app/views/assets/index.html.erb
@@ -1,6 +1,8 @@
 <h1>Assets</h1>
 
-<%= link_to 'New asset', new_asset_path, class: 'action_button' %>
+<%= link_to new_asset_path, class: 'action_button' do %>
+  <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create asset
+<% end %>
 
 <%= will_paginate @assets %>
 
@@ -20,7 +22,9 @@
     <td><%= asset.upload.content_type %></td>
     <td><%= link_to 'Show', asset %></td>
     <td><%= link_to 'Edit', edit_asset_path(asset) %></td>
-    <td><%= button_to 'Destroy', asset, method: :delete, form: { data: { confirm: 'Are you sure?' }, class: 'button_to destructive' } %></td>
+    <td><%= button_to asset, method: :delete, form: { data: { confirm: 'Are you sure?' }, class: 'button_to destructive' } do %>
+      <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
+    <% end %></td>
   </tr>
 <% end %>
 </table>
diff --git a/app/views/assets/show.html.erb b/app/views/assets/show.html.erb
index 0286678..5717dd9 100644
--- a/app/views/assets/show.html.erb
+++ b/app/views/assets/show.html.erb
@@ -6,7 +6,9 @@
     <div class="node_content node_info_group">
       <div class="node_info_group_items">
         <div class="node_info_item">
-          <%= link_to 'Edit', edit_asset_path(@asset), class: 'action_button' %>
+        <%= link_to edit_asset_path(@asset), class: 'action_button' do %>
+          <%= icon("edit", library: "tabler", "aria-hidden": true) %> Edit
+        <% end %>
         </div>
         <div class="node_info_item">
           <%= link_to 'Back', assets_path %>
diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb
index 45b084f..b6564a4 100644
--- a/app/views/events/edit.html.erb
+++ b/app/views/events/edit.html.erb
@@ -2,8 +2,10 @@
 
 <div class="node_action_bar standalone_action_bar">
   <%= link_to 'Back', safe_return_to(params[:return_to] || events_path) %>
-  <%= button_to 'Destroy', event_path(@event), method: :delete,
-        form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } %>
+  <%= button_to event_path(@event), method: :delete,
+        form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } do %>
+    <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
+  <% end %>
 </div>
 
 <%= form_for(@event) do |f| %>
diff --git a/app/views/events/index.html.erb b/app/views/events/index.html.erb
index 3d953d5..dde897e 100644
--- a/app/views/events/index.html.erb
+++ b/app/views/events/index.html.erb
@@ -1,7 +1,11 @@
 <h1>Events</h1>
 
-<%= link_to 'New event', new_event_path, class: 'action_button' %>
-<%= link_to 'View events without a page →', without_node_events_path %>
+<div class="button_row">
+  <%= link_to new_event_path, class: 'action_button' do %>
+    <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create event
+  <% end %>
+  <%= link_to 'View events without a page →', without_node_events_path %>
+</div>
 
 <%= will_paginate @events %>
 
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index 5812228..ac084c9 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -11,10 +11,14 @@
           </div>
         <% end %>
         <div class="node_info_item">
-          <%= link_to 'Edit', edit_event_path(@event, return_to: request.path), class: 'action_button' %>
+          <%= link_to edit_event_path(@event, return_to: request.path), class: 'action_button' do %>
+            <%= icon("edit", library: "tabler", "aria-hidden": true) %> Edit
+          <% end %>
         </div>
         <div class="node_info_item">
-          <%= button_to 'Destroy', event_path(@event), method: :delete, form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } %>
+          <%= button_to event_path(@event), method: :delete, form: { data: { confirm: 'Delete this event?' }, class: 'button_to destructive' } do %>
+            <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
+          <% end %>
         </div>
       </div>
     </div>
diff --git a/app/views/events/without_node.html.erb b/app/views/events/without_node.html.erb
index 52514ab..bb27173 100644
--- a/app/views/events/without_node.html.erb
+++ b/app/views/events/without_node.html.erb
@@ -1,7 +1,9 @@
 <h1>Events without a node</h1>
 
 <%= link_to '← All events', events_path %>
-<%= link_to 'New event', new_event_path, class: 'action_button' %>
+<%= link_to new_event_path, class: 'action_button' do %>
+  <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create event
+<% end %>
 
 <%= will_paginate @events %>
 
diff --git a/app/views/menu_items/index.html.erb b/app/views/menu_items/index.html.erb
index e84199b..591eb68 100644
--- a/app/views/menu_items/index.html.erb
+++ b/app/views/menu_items/index.html.erb
@@ -1,6 +1,8 @@
 <h1>Menu Items</h1>
 
-<%= link_to 'New menu item', new_menu_item_path, class: 'action_button' %>
+<%= link_to new_menu_item_path, class: 'action_button' do %>
+  <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create menu item
+<% end %>
 
 <table id="menu_item_list">
   <% @menu_items.each do |menu_item| %>
@@ -11,9 +13,10 @@
     <td class="menu_item_title"><%= menu_item.title %></td>
     <td><%= link_to "Edit", edit_menu_item_path(menu_item) %></td>
     <td>
-      <%= button_to "Delete", menu_item_path(menu_item),
-            method: :delete,
-            form: { data: { confirm: "Are you sure?" }, class: 'button_to destructive' } %>
+      <%= button_to menu_item_path(menu_item), method: :delete,
+            form: { data: { confirm: "Do you really want to destroy the menu entry?" }, class: 'button_to destructive' } do %>
+        <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
+      <% end %>
     </td>
   </tr>
   <% end %>
diff --git a/app/views/nodes/_node_list.html.erb b/app/views/nodes/_node_list.html.erb
index 03f38b4..f7210f1 100644
--- a/app/views/nodes/_node_list.html.erb
+++ b/app/views/nodes/_node_list.html.erb
@@ -4,7 +4,9 @@
   <% end %>
   <%= hidden_field_tag :tags, params[:tags] if params[:tags].present? %>
   <%= text_field_tag :q, params[:q], placeholder: "Search title, abstract, body…" %>
-  <%= submit_tag "Search", class: "action_button" %>
+  <%= button_tag type: "submit", class: "action_button" do %>
+    <%= icon("search", library: "tabler", "aria-hidden": true) %> Search
+  <% end %>
   <% if params[:q].present? || params[:kinds].present? || params[:tags].present? %>
     <%= link_to "Reset", url_for(controller: params[:controller], action: params[:action]) %>
   <% end %>
diff --git a/app/views/nodes/chapters.html.erb b/app/views/nodes/chapters.html.erb
index 939f19c..543bc53 100644
--- a/app/views/nodes/chapters.html.erb
+++ b/app/views/nodes/chapters.html.erb
@@ -1,9 +1,11 @@
 <h1>Chapters</h1>
 
-<%= form_tag chapters_nodes_path, method: :get do %>
+<%= form_tag chapters_nodes_path, method: :get, class: "node_search_form" do %>
   <label><%= check_box_tag 'kinds[]', 'erfa', @kind_keys.include?('erfa') %> Erfa</label>
   <label><%= check_box_tag 'kinds[]', 'chaostreff', @kind_keys.include?('chaostreff') %> Chaostreff</label>
-  <%= submit_tag "Filter", class: "action_button" %>
+  <%= button_tag type: "submit", class: "action_button" do %>
+    <%= icon("filter", library: "tabler", "aria-hidden": true) %> Filter
+  <% end %>
 <% end %>
 
 <%= render 'node_list' %>
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 13b78fc..1ac05e0 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -6,9 +6,11 @@
         disabled: @node.autosave.present? %>
 
   <% if @node.autosave || (@node.draft && @node.head) %>
-    <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
-          revert_node_path(@node), method: :put,
-          form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } %>
+    <%= button_to revert_node_path(@node), method: :put,
+              form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } do %>
+      <%= icon("trash", library: "tabler", "aria-hidden": true) %>
+      <%= @node.draft && !@node.autosave ? "Destroy Draft" : "Discard Autosave" %>
+    <% end %>
     <% if pair = @node.available_layer_pairs.find { |p| p.include?(:autosave) } %>
       <%= button_to 'What changed?',
             diff_node_revisions_path(@node),
diff --git a/app/views/nodes/index.html.erb b/app/views/nodes/index.html.erb
index 2688ea1..3bb251c 100644
--- a/app/views/nodes/index.html.erb
+++ b/app/views/nodes/index.html.erb
@@ -1,7 +1,9 @@
 <h1>Nodes</h1>
 
 <div>
-  <%= link_to 'New node', new_node_path, class: 'action_button' %>
+  <%= link_to new_node_path, class: 'action_button' do %>
+    <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create node
+  <% end %>
   <span class="field_hint">Creates a node with no parent or kind set — for a specific page, use the wizard's create flow or "add child" from an existing node instead.</span>
 </div>
 
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 07cb5d1..6e20258 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -25,7 +25,10 @@
           <% if locked_by_other %>
             <span class="disabled_action"><%= edit_label %></span>
           <% else %>
-            <%= link_to (@node.autosave ? "Continue Editing" : (@node.draft ? "Edit Draft" : "Lock + Edit")), edit_node_path(@node), class: "action_button" %>
+            <%= link_to edit_node_path(@node), class: "action_button" do %>
+              <%= icon("edit", library: "tabler", "aria-hidden": true) %>
+              <%= @node.autosave ? "Continue Editing" : (@node.draft ? "Edit Draft" : "Lock + Edit") %>
+            <% end %>
             <% if !@node.draft && !@node.autosave %>
               <span class="field_hint">Nothing pending — this will start a fresh draft.</span>
             <% end %>
@@ -51,10 +54,12 @@
           <% end %>
           <% if @node.autosave || (@node.draft && @node.head) %>
             <div class="node_info_item">
-              <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
-                    revert_node_path(@node), method: :put,
-                    params: { return_to: request.path },
-                    form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } %>
+            <%= button_to revert_node_path(@node), method: :put,
+                                params: { return_to: request.path },
+                                form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } do %>
+              <%= icon("trash", library: "tabler", "aria-hidden": true) %>
+              <%= @node.draft && !@node.autosave ? "Destroy Draft" : "Discard Autosave" %>
+            <% end %>
             </div>
           <% end %>
         <% end %>
diff --git a/app/views/occurrences/index.html.erb b/app/views/occurrences/index.html.erb
index 82818d0..aa084ed 100644
--- a/app/views/occurrences/index.html.erb
+++ b/app/views/occurrences/index.html.erb
@@ -18,7 +18,9 @@
     <td><%=h occurrence.event_id %></td>
     <td><%= link_to 'Show', occurrence %></td>
     <td><%= link_to 'Edit', edit_occurrence_path(occurrence) %></td>
-    <td><%= button_to 'Destroy', occurrence, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
+    <td><%= button_to occurrence, method: :delete, form: { data: { confirm: 'Are you sure?' }, class: 'button_to destructive' } do %>
+      <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
+    <% end %></td>
   </tr>
 <% end %>
 </table>
diff --git a/app/views/pages/index.html.erb b/app/views/pages/index.html.erb
index 05c7311..da67871 100644
--- a/app/views/pages/index.html.erb
+++ b/app/views/pages/index.html.erb
@@ -12,7 +12,9 @@
     <td><%=h page.title %></td>
     <td><%= link_to 'Show', content_path(:page_path => page.node.unique_path) %></td>
     <td><%= link_to 'Edit', edit_page_path(page) %></td>
-    <td><%= button_to 'Destroy', page, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
+    <td><%= button_to page, method: :delete, form: { data: { confirm: 'Are you sure?' }, class: 'button_to destructive' } do %>
+      <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
+    <% end %></td>
   </tr>
 <% end %>
 </table>
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index b9ce6bd..5638b7a 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -49,10 +49,12 @@
     <% end %>
 
     <% if !@locked_by_other && (@node.autosave || @node.draft) %>
-      <%= button_to (@node.draft && !@node.autosave ? 'Destroy Draft' : 'Discard Autosave'),
-            revert_node_path(@node), method: :put,
-            params: { return_to: request.fullpath },
-            form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } %>
+      <%= button_to revert_node_path(@node), method: :put,
+                  params: { return_to: request.fullpath },
+                  form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } do %>
+        <%= icon("trash", library: "tabler", "aria-hidden": true) %>
+        <%= @node.draft && !@node.autosave ? "Destroy Draft" : "Discard Autosave" %>
+      <% end %>
     <% end %>
   </p>
 <% end %>
diff --git a/app/views/users/_user.html.erb b/app/views/users/_user.html.erb
index 798b82b..3a88f5e 100644
--- a/app/views/users/_user.html.erb
+++ b/app/views/users/_user.html.erb
@@ -7,9 +7,10 @@
     <%= link_to "edit", edit_user_path(user) %>
   </td>
   <td>
-    <%= button_to "destroy", user_path(user),
-          method: :delete,
-          form: { data: { confirm: "Do you really want to delete user #{user.login}?" }, class: 'button_to destructive' } %>
+  <%= button_to user_path(user), method: :delete,
+        form: { data: { confirm: "Do you really want to destroy user #{user.login}?" }, class: 'button_to destructive' } do %>
+    <%= icon("trash", library: "tabler", "aria-hidden": true) %> Destroy
+  <% end %>
   </td>
   <% end %>
 </tr>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 46e958b..4f5266d 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -1,5 +1,7 @@
 <h1>Admins</h1>
-<%= link_to 'New admin user', new_user_path(admin: true), class: 'action_button' %>
+<%= link_to new_user_path(admin: true), class: 'action_button' do %>
+  <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create admin user
+<% end %>
 <table class="user_table">
   <tr class="header">
     <th>Login</th>
@@ -11,7 +13,9 @@
 </table>
 
 <h1>Users</h1>
-<%= link_to 'New user', new_user_path, class: 'action_button' %>
+<%= link_to new_user_path, class: 'action_button' do %>
+  <%= icon("plus", library: "tabler", "aria-hidden": true) %> Create user
+<% end %>
 <table class="user_table">
   <tr class="header">
     <th>Login</th>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index e744efe..70881db 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -6,7 +6,9 @@
     <div class="node_content node_info_group">
       <div class="node_info_group_items">
         <div class="node_info_item">
-          <%= link_to 'Edit', edit_user_path(@user), class: 'action_button' %>
+        <%= link_to edit_user_path(@user), class: 'action_button' do %>
+          <%= icon("edit", library: "tabler", "aria-hidden": true) %> Edit
+        <% end %>
         </div>
       </div>
     </div>
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index 5cd5ad4..58f8a86 100644
--- a/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@ -13,7 +13,7 @@ class UsersControllerTest < ActionController::TestCase
     login_as :aaron
     get :index
     assert_response :success
-    assert_select "button[type=submit]", "destroy"
+    assert_select "button[type=submit]", "Destroy"
     assert_select "a", "show"
   end
   
-- 
cgit v1.3


From 70653b681d10917b77dced08f577446ced7568f1 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 13 Jul 2026 03:22:37 +0200
Subject: Add RelatedAssetsController: search, attach, detach, reorder

Backend for the asset-picker rebuild -- replaces the plan to dump
every image asset in the system into a hidden, unfiltered browse
panel on every node edit (the actual current behavior, confirmed by
reading nodes/edit.html.erb directly) with a small, name-scoped search
endpoint plus create/destroy/update for attach, detach, and reorder.

No schema change needed -- RelatedAsset already had everything this
requires (asset_id, page_id, an acts_as_list position). search excludes
assets already attached to the page, keeping results meaningfully small
given hundreds of assets total but only a handful per node in practice.
create is find_or_create_by! rather than a bare create!, guarding
against the same asset being attached twice from two separate search
results. update leans on acts_as_list's own insert_at rather than
custom position-shifting logic.

Node#editable_page (autosave || draft || head) is extracted since this
is now its third call site with identical logic -- deliberately not
touching nodes#show, which resolves draft || head without autosave on
purpose, a different and correct semantic for "current committed
state" versus "what's actively being edited."
---
 app/controllers/related_assets_controller.rb       | 50 +++++++++++++
 app/models/node.rb                                 |  4 ++
 config/routes.rb                                   |  6 ++
 test/controllers/related_assets_controller_test.rb | 83 ++++++++++++++++++++++
 4 files changed, 143 insertions(+)
 create mode 100644 app/controllers/related_assets_controller.rb
 create mode 100644 test/controllers/related_assets_controller_test.rb

(limited to 'test')

diff --git a/app/controllers/related_assets_controller.rb b/app/controllers/related_assets_controller.rb
new file mode 100644
index 0000000..906c02c
--- /dev/null
+++ b/app/controllers/related_assets_controller.rb
@@ -0,0 +1,50 @@
+class RelatedAssetsController < ApplicationController
+  before_action :login_required
+  before_action :find_node
+
+  def search
+    term = params[:q].to_s.strip
+    if term.blank?
+      render json: []
+      return
+    end
+
+    attached_ids = @node.editable_page.related_assets.pluck(:asset_id)
+    results = Asset.images
+      .where("name ILIKE ?", "%#{term}%")
+      .where.not(id: attached_ids)
+      .limit(10)
+
+    render json: results.map { |a|
+      { id: a.id, name: a.name, thumb_url: a.upload.url(:thumb) }
+    }
+  end
+
+  def create
+    asset = Asset.find(params[:asset_id])
+    related = @node.editable_page.related_assets.find_or_create_by!(asset: asset)
+
+    render json: {
+      id: related.id,
+      asset_id: asset.id,
+      name: asset.name,
+      thumb_url: asset.upload.url(:thumb)
+    }
+  end
+
+  def destroy
+    @node.editable_page.related_assets.find(params[:id]).destroy
+    head :ok
+  end
+
+  def update
+    @node.editable_page.related_assets.find(params[:id]).insert_at(params[:position].to_i)
+    head :ok
+  end
+
+  private
+
+    def find_node
+      @node = Node.find(params[:node_id])
+    end
+end
diff --git a/app/models/node.rb b/app/models/node.rb
index 1d0a089..0361c1e 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -328,6 +328,10 @@ class Node < ApplicationRecord
     unique_path.length == 3 && unique_path[0] == "updates"
   end
 
+  def editable_page
+    autosave || draft || head
+  end
+
   # Returns immutable node id for all new nodes so that the atom feed entry ids
   # stay the same eventhough the slug or positions changes.
   # Can be removed after a year or so ;)
diff --git a/config/routes.rb b/config/routes.rb
index 92301e5..5d61bae 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -55,6 +55,12 @@ Cccms::Application.routes.draw do
           put :revert
         end
 
+        resources :related_assets, only: [:create, :destroy, :update] do
+          collection do
+            get :search
+          end
+        end
+
         resources :revisions do
           collection do
             post :diff
diff --git a/test/controllers/related_assets_controller_test.rb b/test/controllers/related_assets_controller_test.rb
new file mode 100644
index 0000000..a3082c2
--- /dev/null
+++ b/test/controllers/related_assets_controller_test.rb
@@ -0,0 +1,83 @@
+require 'test_helper'
+
+class RelatedAssetsControllerTest < ActionController::TestCase
+  test "search finds assets by name, excluding ones already attached" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "related_assets_search_test")
+
+    attached = Asset.create!(:name => "biometrics-scan", :upload_content_type => "image/png")
+    node.draft.assets << attached
+
+    Asset.create!(:name => "biometrics-poster", :upload_content_type => "image/png")
+    Asset.create!(:name => "chaostreff-flyer", :upload_content_type => "image/png")
+
+    get :search, params: { :node_id => node.id, :q => "biometrics" }
+
+    json = JSON.parse(response.body)
+    names = json.map { |a| a["name"] }
+    assert_includes names, "biometrics-poster"
+    assert_not_includes names, "biometrics-scan"
+    assert_not_includes names, "chaostreff-flyer"
+  end
+
+  test "search returns an empty list for a blank term" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "related_assets_blank_search_test")
+
+    get :search, params: { :node_id => node.id, :q => "" }
+
+    assert_equal [], JSON.parse(response.body)
+  end
+
+  test "create attaches an asset to the node's editable page" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "related_assets_create_test")
+    asset = Asset.create!(:name => "erfa-photo", :upload_content_type => "image/png")
+
+    post :create, params: { :node_id => node.id, :asset_id => asset.id }
+
+    assert_response :success
+    assert_includes node.draft.reload.related_assets.map(&:asset_id), asset.id
+  end
+
+  test "create does not duplicate an already-attached asset" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "related_assets_dup_test")
+    asset = Asset.create!(:name => "erfa-photo-2", :upload_content_type => "image/png")
+    node.draft.assets << asset
+
+    post :create, params: { :node_id => node.id, :asset_id => asset.id }
+
+    assert_response :success
+    assert_equal 1, node.draft.reload.related_assets.count
+  end
+
+  test "destroy removes the attached asset" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "related_assets_destroy_test")
+    asset = Asset.create!(:name => "old-photo", :upload_content_type => "image/png")
+    node.draft.assets << asset
+    related = node.draft.related_assets.first
+
+    delete :destroy, params: { :node_id => node.id, :id => related.id }
+
+    assert_response :success
+    assert_equal 0, node.draft.reload.related_assets.count
+  end
+
+  test "update reorders the attached assets" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "related_assets_reorder_test")
+    first  = Asset.create!(:name => "first-photo", :upload_content_type => "image/png")
+    second = Asset.create!(:name => "second-photo", :upload_content_type => "image/png")
+    node.draft.assets << first
+    node.draft.assets << second
+
+    second_related = node.draft.related_assets.find_by(:asset_id => second.id)
+    patch :update, params: { :node_id => node.id, :id => second_related.id, :position => 1 }
+
+    assert_response :success
+    ordered_asset_ids = node.draft.reload.related_assets.map(&:asset_id)
+    assert_equal [second.id, first.id], ordered_asset_ids
+  end
+end
-- 
cgit v1.3


From 5f56fa867f073d8d1aecbfbba4a340ea414cfb0d Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 13 Jul 2026 03:48:28 +0200
Subject: Add loadOnFocus to initSearchPicker; asset search shows recent by
 default

initSearchPicker's input handler has always short-circuited on an empty
term -- correct for every existing picker, none of which want results
appearing before anything's typed. The asset picker does want exactly
that (show the last few uploaded images without requiring a search
first), so this adds an opt-in loadOnFocus option instead of changing
the shared default: it fires once when the input gains focus with no
term yet, reusing the same request/render path a real search uses
rather than a separate code path. The AJAX call itself was pulled out
into a named runSearch function so both triggers could share it without
duplicating the success/render logic.

RelatedAssetsController#search now treats a blank term as "show the
most recently created, unattached images" (limit 5) rather than
returning nothing, matching the new client behavior. A real search
term still returns up to 10 name-matched results, unchanged.
---
 app/controllers/related_assets_controller.rb       |  18 ++-
 public/javascripts/admin_search.js                 | 133 +++++++++++----------
 test/controllers/related_assets_controller_test.rb |  16 ++-
 3 files changed, 91 insertions(+), 76 deletions(-)

(limited to 'test')

diff --git a/app/controllers/related_assets_controller.rb b/app/controllers/related_assets_controller.rb
index 906c02c..ae37d2f 100644
--- a/app/controllers/related_assets_controller.rb
+++ b/app/controllers/related_assets_controller.rb
@@ -3,17 +3,15 @@ class RelatedAssetsController < ApplicationController
   before_action :find_node
 
   def search
-    term = params[:q].to_s.strip
-    if term.blank?
-      render json: []
-      return
-    end
-
+    term = params[:search_term].to_s.strip
     attached_ids = @node.editable_page.related_assets.pluck(:asset_id)
-    results = Asset.images
-      .where("name ILIKE ?", "%#{term}%")
-      .where.not(id: attached_ids)
-      .limit(10)
+    scope = Asset.images.where.not(id: attached_ids)
+
+    results = if term.present?
+      scope.where("name ILIKE ?", "%#{term}%").limit(10)
+    else
+      scope.order(created_at: :desc).limit(5)
+    end
 
     render json: results.map { |a|
       { id: a.id, name: a.name, thumb_url: a.upload.url(:thumb) }
diff --git a/public/javascripts/admin_search.js b/public/javascripts/admin_search.js
index 0c768a3..7604bb7 100644
--- a/public/javascripts/admin_search.js
+++ b/public/javascripts/admin_search.js
@@ -42,18 +42,76 @@ function initSearchPicker(options) {
   var inputSelector = options.inputSelector;
   var resultsSelector = options.resultsSelector;
   var url = options.url || ADMIN_MENU_SEARCH_URL;
-  var onSelect = options.onSelect;                   // omit for a real-navigation search like admin_search
-  var isActive = options.isActive;                   // optional guard, checked before every search
-  var resultsHeaderHtml = options.resultsHeaderHtml; // optional, prepended only when results exist
-  var renderResults = options.renderResults;         // optional, replaces the default per-node rendering entirely
+  var onSelect = options.onSelect;
+  var isActive = options.isActive;
+  var resultsHeaderHtml = options.resultsHeaderHtml;
+  var renderResults = options.renderResults;
+  var loadOnFocus = options.loadOnFocus; // optional, fires an initial search on focus with no term typed yet
   var requestId = 0;
   var timeout;
+  var results = $(resultsSelector);
+
+  function runSearch(term) {
+    var thisRequest = ++requestId;
+    $.ajax({
+      type: "GET",
+      url: url,
+      data: "search_term=" + term,
+      dataType: "json",
+      success: function(data) {
+        if (thisRequest !== requestId) return;
+        results.empty();
+
+        var found;
+        if (renderResults) {
+          found = renderResults(data, results, resultsHeaderHtml);
+        } else {
+          if (data.length && resultsHeaderHtml) {
+            results.append(resultsHeaderHtml);
+          }
+          found = false;
+          for (var i = 0; i < data.length; i++) {
+            (function(node) {
+              var link;
+              if (onSelect) {
+                link = $(
+                  "<p><a href='#'>" + node.title +
+                    "<span class='result_path'>" + node.unique_name + "</span></a></p>"
+                );
+                link.find("a").bind("click", function() {
+                  onSelect(node);
+                  results.slideUp();
+                  results.empty();
+                  return false;
+                });
+              } else {
+                link = $(
+                  "<p><a href='" + node.node_path + "'>" + node.title +
+                    "<span class='result_path'>" + node.unique_name + "</span></a></p>"
+                );
+              }
+              results.append(link);
+              found = true;
+            })(data[i]);
+          }
+        }
+
+        if (found) {
+          results.slideDown();
+        } else {
+          results.slideUp();
+        }
+      },
+      error: function(xhr, status, error) {
+        console.log("Ajax error:", status, error, xhr.status, xhr.responseText);
+      }
+    });
+  }
 
   $(inputSelector).bind("input", function() {
     if (isActive && !isActive()) return;
 
     var term = $(this).val();
-    var results = $(resultsSelector);
     clearTimeout(timeout);
 
     if (!term) {
@@ -62,63 +120,16 @@ function initSearchPicker(options) {
       return;
     }
 
-    timeout = setTimeout(function() {
-      var thisRequest = ++requestId;
-      $.ajax({
-        type: "GET",
-        url: url,
-        data: "search_term=" + term,
-        dataType: "json",
-        success: function(data) {
-          if (thisRequest !== requestId) return;
-          results.empty();
-
-          var found;
-          if (renderResults) {
-            found = renderResults(data, results, resultsHeaderHtml);
-          } else {
-            if (data.length && resultsHeaderHtml) {
-              results.append(resultsHeaderHtml);
-            }
-            found = false;
-            for (var i = 0; i < data.length; i++) {
-              (function(node) {
-                var link;
-                if (onSelect) {
-                  link = $(
-                    "<p><a href='#'>" + node.title +
-                      "<span class='result_path'>" + node.unique_name + "</span></a></p>"
-                  );
-                  link.find("a").bind("click", function() {
-                    onSelect(node);
-                    results.slideUp();
-                    results.empty();
-                    return false;
-                  });
-                } else {
-                  link = $(
-                    "<p><a href='" + node.node_path + "'>" + node.title +
-                      "<span class='result_path'>" + node.unique_name + "</span></a></p>"
-                  );
-                }
-                results.append(link);
-                found = true;
-              })(data[i]);
-            }
-          }
-
-          if (found) {
-            results.slideDown();
-          } else {
-            results.slideUp();
-          }
-        },
-        error: function(xhr, status, error) {
-          console.log("Ajax error:", status, error, xhr.status, xhr.responseText);
-        }
-      });
-    }, 250);
+    timeout = setTimeout(function() { runSearch(term); }, 250);
   });
+
+  if (loadOnFocus) {
+    $(inputSelector).bind("focus", function() {
+      if (isActive && !isActive()) return;
+      if ($(this).val()) return; // the input handler above already covers a real term
+      runSearch("");
+    });
+  }
 }
 
 dashboard_search = {
diff --git a/test/controllers/related_assets_controller_test.rb b/test/controllers/related_assets_controller_test.rb
index a3082c2..7f6d487 100644
--- a/test/controllers/related_assets_controller_test.rb
+++ b/test/controllers/related_assets_controller_test.rb
@@ -11,7 +11,7 @@ class RelatedAssetsControllerTest < ActionController::TestCase
     Asset.create!(:name => "biometrics-poster", :upload_content_type => "image/png")
     Asset.create!(:name => "chaostreff-flyer", :upload_content_type => "image/png")
 
-    get :search, params: { :node_id => node.id, :q => "biometrics" }
+    get :search, params: { :node_id => node.id, :search_term => "biometrics" }
 
     json = JSON.parse(response.body)
     names = json.map { |a| a["name"] }
@@ -20,13 +20,19 @@ class RelatedAssetsControllerTest < ActionController::TestCase
     assert_not_includes names, "chaostreff-flyer"
   end
 
-  test "search returns an empty list for a blank term" do
+  test "search with a blank term returns the most recently created assets" do
+    Asset.delete_all
+    RelatedAsset.delete_all
     login_as :quentin
-    node = Node.root.children.create!(:slug => "related_assets_blank_search_test")
+    node = Node.root.children.create!(:slug => "related_assets_recent_test")
 
-    get :search, params: { :node_id => node.id, :q => "" }
+    Asset.create!(:name => "older-photo", :upload_content_type => "image/png", :created_at => 2.days.ago)
+    Asset.create!(:name => "newer-photo", :upload_content_type => "image/png", :created_at => 1.hour.ago)
 
-    assert_equal [], JSON.parse(response.body)
+    get :search, params: { :node_id => node.id, :search_term => "" }
+
+    json = JSON.parse(response.body)
+    assert_equal ["newer-photo", "older-photo"], json.map { |a| a["name"] }
   end
 
   test "create attaches an asset to the node's editable page" do
-- 
cgit v1.3


From 8baac265059b70da0148487458ee4077b15f155e Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 13 Jul 2026 04:54:33 +0200
Subject: Asset picker: attach/detach/reorder UI, read-only view, autosave fix

Replaces nodes#edit's old Images section -- a hidden panel dumping
every image asset in the system unfiltered (#image_browser) plus a
raw drag-and-drop box (#image_box) -- with a small search-and-click
picker built on the endpoint from the last two commits. Attaching
posts immediately and appends the new thumbnail via a cloned
<template> -- icons only render correctly through the Rails helper
server-side, so the template holds real, pre-rendered markup for JS
to clone rather than duplicating raw SVG in a JS string. Reordering is
jQuery UI sortable on the small attached list only, with a dedicated
drag handle rather than the whole thumbnail.

Two bugs caught while click-testing, fixed here rather than shipped
and patched after: the search panel never closed after attaching an
image, since the success handler re-triggered focus to keep it open
for attaching several in a row -- which meant it just re-populated
itself forever instead of signaling "done." Fixed to close explicitly;
a click-outside-closes handler was added alongside it, matching the
affordance the top-bar search already has.

A real, independent, pre-existing data bug surfaced during the same
testing: Node#autosave!'s first-time-creation branch never carried
related assets forward from whatever page was previously current --
attach an image, let autosave fire once, and it silently landed on a
fresh, assetless Page row. Long-dormant, not introduced by this work,
just finally exercised by something that made it visible. Fixed inside
the `unless self.autosave` guard specifically -- running this on every
call, not just creation, would overwrite anything attached directly to
an existing autosave in between, a worse bug than the one being fixed.

nodes#show gains a read-only Images section, rendered only when a page
actually has attached images, so an attachment can be confirmed
present without entering the edit/lock cycle -- useful on its own, and
specifically useful the next time an asset bug needs investigating.
Its thumbnail CSS is shared with the edit view's picker via a class
(.thumbnail_list) rather than duplicated under a second name.
---
 app/controllers/related_assets_controller.rb       |  3 +-
 app/models/node.rb                                 |  1 +
 app/views/layouts/admin.html.erb                   |  1 +
 app/views/nodes/edit.html.erb                      | 39 +++++++----
 app/views/nodes/show.html.erb                      | 11 +++
 public/javascripts/admin_interface.js              |  4 ++
 public/javascripts/related_assets.js               | 80 ++++++++++++++++++++++
 public/stylesheets/admin.css                       | 75 ++++++++++++++++++++
 test/controllers/related_assets_controller_test.rb |  2 +
 test/models/node_test.rb                           | 29 ++++++++
 10 files changed, 230 insertions(+), 15 deletions(-)
 create mode 100644 public/javascripts/related_assets.js

(limited to 'test')

diff --git a/app/controllers/related_assets_controller.rb b/app/controllers/related_assets_controller.rb
index ae37d2f..479ebec 100644
--- a/app/controllers/related_assets_controller.rb
+++ b/app/controllers/related_assets_controller.rb
@@ -26,7 +26,8 @@ class RelatedAssetsController < ApplicationController
       id: related.id,
       asset_id: asset.id,
       name: asset.name,
-      thumb_url: asset.upload.url(:thumb)
+      thumb_url: asset.upload.url(:thumb),
+      url: node_related_asset_path(@node, related)
     }
   end
 
diff --git a/app/models/node.rb b/app/models/node.rb
index 0361c1e..6f435ee 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -80,6 +80,7 @@ class Node < ApplicationRecord
 
     unless self.autosave
       self.autosave = Page.create!(:editor => current_user)
+      self.autosave.assets = (self.draft || self.head).assets if self.draft || self.head
       self.save!
     end
     self.autosave.assign_attributes(attributes)
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 5ae363f..8bbc0d5 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -13,6 +13,7 @@
     <link rel="stylesheet" href="/stylesheets/admin.css">
     <script src="/javascripts/admin_search.js"></script>
     <script src="/javascripts/admin_interface.js"></script>
+    <script src="/javascripts/related_assets.js"></script>
     <script>
       var ADMIN_SEARCH_URL = "<%= admin_search_path %>";
       var ADMIN_MENU_SEARCH_URL = "<%= admin_menu_search_path %>";
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb
index 1ac05e0..e0e51d8 100644
--- a/app/views/nodes/edit.html.erb
+++ b/app/views/nodes/edit.html.erb
@@ -76,24 +76,35 @@
 
       <div class="node_description">Images</div>
       <div class="node_content">
-        <ul id="image_box" rel="<%= @page.id %>">
-          <% @page.assets.images.each do |image| %>
-            <li rel="images_<%= image.id %>">
-              <%= image_tag(image.upload.url(:thumb)) %>
-            </li>
-          <% end %>
-        </ul>
-        <div class="clear_left right">
-          <a id="image_browser_toggle" class="unselected" href="#">image browser</a>
-        </div>
-        <div id="image_browser">
-          <ul>
-            <% Asset.images.each do |image| %>
-            <li rel="images_<%= image.id %>"><%= image_tag(image.upload.url(:thumb)) %></li>
+        <div id="related_assets"
+             data-search-url="<%= search_node_related_assets_path(@node) %>"
+             data-create-url="<%= node_related_assets_path(@node) %>">
+          <ul id="related_asset_list" class="thumbnail_list">
+            <% @page.related_assets.includes(:asset).each do |related| %>
+              <li data-url="<%= node_related_asset_path(@node, related) %>">
+                <span class="related_asset_handle"><%= icon("grip-vertical", library: "tabler", "aria-hidden": true) %></span>
+                <%= image_tag related.asset.upload.url(:thumb) %>
+                <button type="button" class="related_asset_remove" aria-label="Remove image">
+                  <%= icon("x", library: "tabler", "aria-hidden": true) %>
+                </button>
+              </li>
             <% end %>
           </ul>
+          <%= text_field_tag nil, nil, id: "related_asset_search_term", placeholder: "Search images to attach…", autocomplete: "off" %>
+          <div id="related_asset_search_results" class="search_results"></div>
         </div>
       </div>
+
+      <template id="related_asset_template">
+        <li>
+          <span class="related_asset_handle"><%= icon("grip-vertical", library: "tabler", "aria-hidden": true) %></span>
+          <img src="">
+          <button type="button" class="related_asset_remove" aria-label="Remove image">
+            <%= icon("x", library: "tabler", "aria-hidden": true) %>
+          </button>
+        </li>
+      </template>
+
     </div>
   </details>
 
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 280e492..8ea03cd 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -152,6 +152,17 @@
     <div class="node_description">Tags</div>
     <div class="node_content node_info_group"><%= @page.tag_list %></div>
 
+    <% if @page.assets.images.any? %>
+      <div class="node_description">Images</div>
+      <div class="node_content node_info_group">
+        <ul class="thumbnail_list">
+          <% @page.assets.images.each do |asset| %>
+            <li><%= link_to image_tag(asset.upload.url(:thumb)), asset_path(asset) %></li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
+
     <div class="node_description">Events</div>
     <div class="node_content node_info_group">
       <ul>
diff --git a/public/javascripts/admin_interface.js b/public/javascripts/admin_interface.js
index 3f6a0a9..619933d 100644
--- a/public/javascripts/admin_interface.js
+++ b/public/javascripts/admin_interface.js
@@ -59,6 +59,10 @@ $(document).ready(function () {
     event_search.initialize_search();
   }
 
+  if ($("#related_asset_search_term").length != 0) {
+    related_assets.initialize();
+  }
+
   if ($("#rrule_builder").length != 0) {
     rrule_builder.initialize();
   }
diff --git a/public/javascripts/related_assets.js b/public/javascripts/related_assets.js
new file mode 100644
index 0000000..2955cbf
--- /dev/null
+++ b/public/javascripts/related_assets.js
@@ -0,0 +1,80 @@
+related_assets = {
+  initialize: function() {
+    var container = $("#related_assets");
+    var searchUrl = container.data("search-url");
+    var createUrl = container.data("create-url");
+    var list = $("#related_asset_list");
+
+    initSearchPicker({
+      inputSelector: "#related_asset_search_term",
+      resultsSelector: "#related_asset_search_results",
+      url: searchUrl,
+      loadOnFocus: true,
+      renderResults: function(data, results) {
+        var found = false;
+        data.forEach(function(asset) {
+          var item = $(
+            "<a href='#' class='related_asset_result'>" +
+              "<img src='" + asset.thumb_url + "' alt=''>" +
+              "<span>" + asset.name + "</span>" +
+            "</a>"
+          );
+          item.bind("click", function() {
+            related_assets.attach(asset.id, createUrl, list);
+            return false;
+          });
+          results.append(item);
+          found = true;
+        });
+        return found;
+      }
+    });
+
+    $(document).on("click", function(e) {
+      if (!$(e.target).closest("#related_assets").length) {
+        $("#related_asset_search_results").slideUp().empty();
+      }
+    });
+
+    list.sortable({
+      handle: ".related_asset_handle",
+      update: function(event, ui) {
+        var newPosition = ui.item.index() + 1; // acts_as_list is 1-based; jQuery UI's index() is 0-based
+        $.ajax({
+          type: "PATCH",
+          url: ui.item.data("url"),
+          data: "position=" + newPosition
+        });
+      }
+    });
+
+    list.on("click", ".related_asset_remove", function() {
+      var item = $(this).closest("li");
+      $.ajax({
+        type: "DELETE",
+        url: item.data("url"),
+        success: function() {
+          item.remove();
+        }
+      });
+    });
+  },
+
+  attach: function(assetId, createUrl, list) {
+    $.ajax({
+      type: "POST",
+      url: createUrl,
+      data: "asset_id=" + assetId,
+      dataType: "json",
+      success: function(related) {
+        var item = $($("#related_asset_template").html().trim());
+        item.attr("data-url", related.url);
+        item.find("img").attr("src", related.thumb_url);
+        list.append(item);
+        list.sortable("refresh");
+        $("#related_asset_search_term").val("");
+        $("#related_asset_search_results").slideUp().empty();
+      }
+    });
+  }
+};
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index a58a061..c3c0cb4 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -1210,3 +1210,78 @@ div#image_browser {
 div#image_browser ul li {
   list-style-type: none;
 }
+
+.thumbnail_list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.75rem;
+  list-style: none;
+  margin: 0 0 0.75rem;
+  padding: 0;
+}
+
+.thumbnail_list li {
+  position: relative;
+  display: flex;
+  align-items: center;
+  gap: 0.25rem;
+  border: 1px solid #e8e8e8;
+  border-radius: 6px;
+  padding: 4px;
+}
+
+.thumbnail_list img {
+  display: block;
+  width: 60px;
+  height: 60px;
+  object-fit: cover;
+  border-radius: 4px;
+}
+
+.related_asset_handle {
+  display: flex;
+  color: #969696;
+  cursor: grab;
+}
+
+.related_asset_handle svg {
+  width: 1rem;
+  height: 1rem;
+}
+
+.related_asset_remove {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: none;
+  border: none;
+  padding: 2px;
+  cursor: pointer;
+  color: #969696;
+}
+
+.related_asset_remove svg {
+  width: 0.9rem;
+  height: 0.9rem;
+}
+
+.related_asset_remove:hover {
+  color: #cc0000;
+}
+
+.related_asset_result {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  padding: 4px;
+  border-bottom: 1px solid #e8e8e8;
+  text-decoration: none;
+}
+
+.related_asset_result img {
+  width: 40px;
+  height: 40px;
+  object-fit: cover;
+  border-radius: 4px;
+}
+
diff --git a/test/controllers/related_assets_controller_test.rb b/test/controllers/related_assets_controller_test.rb
index 7f6d487..9d20cbb 100644
--- a/test/controllers/related_assets_controller_test.rb
+++ b/test/controllers/related_assets_controller_test.rb
@@ -44,6 +44,8 @@ class RelatedAssetsControllerTest < ActionController::TestCase
 
     assert_response :success
     assert_includes node.draft.reload.related_assets.map(&:asset_id), asset.id
+    json = JSON.parse(response.body)
+    assert json["url"].present?
   end
 
   test "create does not duplicate an already-attached asset" do
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index 0bce222..a1da82c 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -585,4 +585,33 @@ class NodeTest < ActiveSupport::TestCase
 
     assert_not_includes Node.recently_changed, node
   end
+
+  test "autosave! carries over the current related assets to the newly created autosave row" do
+    node = Node.root.children.create!(:slug => "autosave_asset_carryover_test")
+    user = User.find_by_login("quentin")
+    asset = Asset.create!(:name => "carryover-photo", :upload_content_type => "image/png")
+    node.draft.assets << asset
+
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v1"}, user)
+
+    assert_includes node.autosave.reload.assets, asset
+  end
+
+  test "autosave! does not reset assets already attached directly to an existing autosave" do
+    node = Node.root.children.create!(:slug => "autosave_asset_no_reset_test")
+    user = User.find_by_login("quentin")
+    original = Asset.create!(:name => "original-photo", :upload_content_type => "image/png")
+    extra = Asset.create!(:name => "extra-photo", :upload_content_type => "image/png")
+    node.draft.assets << original
+
+    node.lock_for_editing!(user)
+    node.autosave!({:title => "v1"}, user)
+    node.autosave.assets << extra
+
+    node.autosave!({:title => "v2"}, user)
+
+    assert_includes node.autosave.reload.assets, original
+    assert_includes node.autosave.reload.assets, extra
+  end
 end
-- 
cgit v1.3


From ea8ee1d35948c6adc4a377c9eb77d99b2d856932 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 13 Jul 2026 14:12:33 +0200
Subject: Carry over other-locale translations when creating an autosave

Node#autosave! only copied assets forward onto a newly created
autosave, not translations. Invisible for single-locale nodes, but a
node with an existing multi-locale head/draft that gets locked and
edited in one locale would silently drop every other locale's
translation from the new autosave -- and from there into the draft
and eventually head, since save_draft! faithfully clones whatever
the autosave actually holds.

Fixed by using clone_attributes_from, which already does a complete
clone (translations, assets, tags, template, published_at) -- the
same method save_draft! already relies on two branches later, so no
new mechanism, just closing the one place still doing a partial,
hand-rolled version of it.
---
 app/models/node.rb       |  2 +-
 test/models/node_test.rb | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/app/models/node.rb b/app/models/node.rb
index 6f435ee..535d8f1 100644
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -80,7 +80,7 @@ class Node < ApplicationRecord
 
     unless self.autosave
       self.autosave = Page.create!(:editor => current_user)
-      self.autosave.assets = (self.draft || self.head).assets if self.draft || self.head
+      self.autosave.clone_attributes_from(self.draft || self.head) if self.draft || self.head
       self.save!
     end
     self.autosave.assign_attributes(attributes)
diff --git a/test/models/node_test.rb b/test/models/node_test.rb
index a1da82c..91a4a6d 100644
--- a/test/models/node_test.rb
+++ b/test/models/node_test.rb
@@ -614,4 +614,36 @@ class NodeTest < ActiveSupport::TestCase
     assert_includes node.autosave.reload.assets, original
     assert_includes node.autosave.reload.assets, extra
   end
+
+  test "autosave! carries over other-locale translations to the newly created autosave row" do
+    node = Node.root.children.create!(:slug => "autosave_translation_carryover_test")
+    user = User.find_by_login("quentin")
+
+    Globalize.with_locale(:en) { node.draft.update!(:title => "English title") }
+
+    node.lock_for_editing!(user)
+    Globalize.with_locale(:de) { node.autosave!({:title => "German edit"}, user) }
+
+    autosave = node.autosave.reload
+    assert_includes autosave.translated_locales, :en
+    assert_equal "English title", Globalize.with_locale(:en) { autosave.title }
+    assert_equal "German edit",   Globalize.with_locale(:de) { autosave.title }
+  end
+
+  test "autosave! does not reset other-locale translations already attached directly to an existing autosave" do
+    node = Node.root.children.create!(:slug => "autosave_translation_no_reset_test")
+    user = User.find_by_login("quentin")
+
+    Globalize.with_locale(:en) { node.draft.update!(:title => "Original English title") }
+
+    node.lock_for_editing!(user)
+    Globalize.with_locale(:de) { node.autosave!({:title => "v1"}, user) }
+    Globalize.with_locale(:en) { node.autosave.update!(:title => "Edited directly on autosave") }
+
+    Globalize.with_locale(:de) { node.autosave!({:title => "v2"}, user) }
+
+    autosave = node.autosave.reload
+    assert_equal "Edited directly on autosave", Globalize.with_locale(:en) { autosave.title }
+    assert_equal "v2",                          Globalize.with_locale(:de) { autosave.title }
+  end
 end
-- 
cgit v1.3


From 0b6ae26f3b4c3c8278e569fa6644a544e996c25d Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 13 Jul 2026 16:36:38 +0200
Subject: Add per-node translation management: list, edit, destroy, compare

Replaces the old locale-switch-and-edit-the-same-screen workflow,
which conflated presentation locale with content locale and let an
editor silently drift into editing the wrong language with no
persistent signal that anything had changed. Non-default-locale
content now has its own explicit routes and screens, never sharing
a route param with the ambient chrome locale.

- PageTranslationsController: index/show/edit/update/destroy,
  scoped to Page.non_default_locales; update handles first-time
  creation too, so there's no separate new/create step.
- Reads go through the actual PageTranslation row
  (Page#translation_summary), never through the Globalize
  fallback-bearing accessor -- fallback is correct for public
  rendering but wrong for editing, where a missing translation
  needs to look empty, not borrowed from another locale.
- Translations ride on the page's own draft/head cycle; no
  independent publish state.
- nodes#show gains a Translations section (per-locale Lock+Edit /
  Create+Lock, Destroy, a link into the read-only Compare view) and
  a locale indicator on its own default-locale content; nodes#edit,
  nodes#update, and nodes#autosave are pinned to the default locale
  via Globalize.with_locale regardless of the ambient route locale.
- nodes#show no longer double-loads the node or calls wipe_draft!
  on every view (see previous commit for why that's now safe).
- .preview_link_row is renamed .aligned_action_row now that it has
  a second real consumer.
---
 app/controllers/nodes_controller.rb                | 12 ++-
 app/controllers/page_translations_controller.rb    | 98 ++++++++++++++++++++++
 app/models/page.rb                                 | 21 +++++
 app/views/nodes/show.html.erb                      | 49 +++++++++--
 app/views/page_translations/edit.html.erb          | 39 +++++++++
 app/views/page_translations/index.html.erb         | 19 +++++
 app/views/page_translations/show.html.erb          | 27 ++++++
 config/routes.rb                                   |  6 ++
 public/stylesheets/admin.css                       | 27 +++++-
 .../page_translations_controller_test.rb           | 78 +++++++++++++++++
 10 files changed, 366 insertions(+), 10 deletions(-)
 create mode 100644 app/controllers/page_translations_controller.rb
 create mode 100644 app/views/page_translations/edit.html.erb
 create mode 100644 app/views/page_translations/index.html.erb
 create mode 100644 app/views/page_translations/show.html.erb
 create mode 100644 test/controllers/page_translations_controller_test.rb

(limited to 'test')

diff --git a/app/controllers/nodes_controller.rb b/app/controllers/nodes_controller.rb
index c1468be..249602d 100644
--- a/app/controllers/nodes_controller.rb
+++ b/app/controllers/nodes_controller.rb
@@ -16,6 +16,8 @@ class NodesController < ApplicationController
                               :revert
                             ]
 
+  around_action :pin_to_default_locale, :only => [:show, :edit, :update, :autosave]
+
   def index
     @nodes = Node.root.descendants.includes(:head, :draft)
       .order('id DESC')
@@ -59,9 +61,9 @@ class NodesController < ApplicationController
   end
 
   def show
-    node = Node.find(params[:id])
-    node.wipe_draft!
-    @page = node.draft || node.head
+    @page = @node.draft || @node.head
+    @default_translation = @page.translations.find_by(:locale => I18n.default_locale)
+    @translations = @page.translation_summary
   end
 
   def edit
@@ -248,6 +250,10 @@ class NodesController < ApplicationController
       end
     end
 
+    def pin_to_default_locale
+      Globalize.with_locale(I18n.default_locale) { yield }
+    end
+
     def descendant_counts_for(ordered_with_level)
       counts = Hash.new(0)
       stack = [] # [node, level, index]
diff --git a/app/controllers/page_translations_controller.rb b/app/controllers/page_translations_controller.rb
new file mode 100644
index 0000000..47f01f7
--- /dev/null
+++ b/app/controllers/page_translations_controller.rb
@@ -0,0 +1,98 @@
+class PageTranslationsController < ApplicationController
+  layout 'admin'
+
+  before_action :login_required
+  before_action :find_node
+  before_action :find_locale, :only => [:show, :edit, :update, :destroy]
+
+  def index
+    page = @node.draft || @node.head
+    @translations = page ? page.translation_summary : []
+  end
+
+  def show
+    @page = @node.draft || @node.head
+    @translation         = @page.translations.find_by(:locale => @locale)
+    @default_translation = @page.translations.find_by(:locale => I18n.default_locale)
+  end
+
+  def edit
+    @node.lock_for_editing!(current_user)
+    @page = @node.draft || @node.head
+    @translation = @page.translations.find_by(:locale => @locale)
+  rescue LockedByAnotherUser => e
+    flash[:error] = e.message
+    redirect_to node_path(@node)
+  end
+
+  def update
+    draft = ensure_editable_draft
+    Globalize.with_locale(@locale) { draft.update!(translation_params) }
+    flash[:notice] = "#{@locale.upcase} translation saved. Publish the draft to make it live."
+
+    if params[:commit] == "Save + Unlock + Exit"
+      @node.unlock!
+      redirect_to node_path(@node)
+    else
+      redirect_to edit_node_translation_path(@node, @locale)
+    end
+  rescue LockedByAnotherUser => e
+    flash[:error] = e.message
+    redirect_to node_path(@node)
+  end
+
+  def destroy
+    base = @node.draft || @node.head
+    unless base && base.translated_locales.include?(@locale)
+      flash[:error] = "No #{@locale.to_s.upcase} translation exists to remove."
+      return redirect_to node_path(@node)
+    end
+
+    if (base.translated_locales - [@locale]).empty?
+      flash[:error] = "Can't remove the only remaining translation."
+      return redirect_to node_path(@node)
+    end
+
+    draft = ensure_editable_draft
+    draft.translations.where(:locale => @locale).delete_all
+    draft.reload
+
+    flash[:notice] = "#{@locale.upcase} translation removed from the draft. Publish to make this permanent."
+    redirect_to node_path(@node)
+  rescue LockedByAnotherUser => e
+    flash[:error] = e.message
+    redirect_to node_path(@node)
+  end
+
+  private
+
+    def find_node
+      @node = Node.find(params[:node_id])
+    end
+
+    # Every remaining action's :translation_locale is already
+    # router-constrained to non-default locales, so this should never
+    # actually fire in practice -- it's a deliberate second check, kept
+    # as a drift detector in case the route constraint and this list
+    # (both driven by Page.non_default_locales) ever disagree.
+    def find_locale
+      candidate = params[:translation_locale].to_s.to_sym
+      unless Page.non_default_locales.include?(candidate)
+        raise ActionController::RoutingError, "Unknown or default locale"
+      end
+      @locale = candidate
+    end
+
+    # Never mutates head directly. Locks first (same guard as the
+    # primary editor), then reuses an existing draft or creates one --
+    # deliberately not going through the autosave buffer: this is a
+    # plain, explicit Save, not a live-typing surface.
+    def ensure_editable_draft
+      @node.lock_for_editing!(current_user)
+      @node.draft || @node.create_new_draft(current_user)
+    end
+
+    def translation_params
+      params.fetch(:page, {}).permit(:title, :abstract, :body)
+    end
+end
diff --git a/app/models/page.rb b/app/models/page.rb
index db5b688..f796228 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -87,6 +87,27 @@ class Page < ApplicationRecord
     end
   end
 
+  def self.non_default_locales
+    I18n.available_locales - [:root, I18n.default_locale]
+  end
+
+  # One row per non-default locale, read from the actual translation
+  # row -- never through the locale-dependent accessor, so a locale
+  # with no real translation yet reports as absent rather than quietly
+  # showing a fallback value borrowed from another locale.
+  def translation_summary
+    Page.non_default_locales.map do |locale|
+      translation = translations.find_by(:locale => locale)
+      {
+        :locale     => locale,
+        :exists     => translation.present?,
+        :title      => translation&.title,
+        :updated_at => translation&.updated_at,
+        :outdated   => translation.present? && outdated_translations?(:locale => locale)
+      }
+    end
+  end
+
   def self.untranslated(options = {:locale => :de})
     PageTranslation.all.group_by(&:page_id).select do |k,v|
       v.size == 1 && v.map{|x| x.locale}.include?(options[:locale])
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb
index 54bb38f..e6a922b 100644
--- a/app/views/nodes/show.html.erb
+++ b/app/views/nodes/show.html.erb
@@ -1,6 +1,6 @@
 <% locked_by_other = @node.locked? && @node.lock_owner != current_user %>
 <div id="page_editor" class="show_node">
-  <h1><%= title_for_node(@node) %></h1>
+  <h1><%= title_for_node(@node) %> <small>(<%= I18n.default_locale.to_s.upcase %>)</small></h1>
   <div id="content">
     <div class="node_description">Status</div>
     <div class="node_content node_info_group node_status">
@@ -70,6 +70,46 @@
       <% end %>
     </div>
 
+    <div class="node_description">Translations</div>
+    <div class="node_content node_info_group">
+      <div class="node_info_group_items">
+        <div class="node_info_item">
+          <span class="node_info_label"><%= I18n.default_locale.to_s.upcase %> (default)</span>
+          <%= @page.title %> — updated <%= @default_translation&.updated_at || @page.updated_at %>
+        </div>
+        <% @translations.each do |t| %>
+          <div class="node_info_item">
+            <span class="node_info_label"><%= t[:locale].to_s.upcase %></span>
+            <div class="aligned_action_row">
+              <% if t[:exists] %>
+                <%= link_to t[:title], node_translation_path(@node, t[:locale]) %> — updated <%= t[:updated_at] %>
+                <% if t[:outdated] %>
+                  <span class="warning">may be outdated</span>
+                <% end %>
+              <% else %>
+                <span class="field_hint">Not yet translated.</span>
+              <% end %>
+              <% if locked_by_other %>
+                <span class="disabled_action"><%= t[:exists] ? "Lock + Edit" : "Create translation + Lock" %></span>
+              <% else %>
+                <%= link_to edit_node_translation_path(@node, t[:locale]), class: "action_button" do %>
+                  <%= icon(t[:exists] ? "edit" : "language", library: "tabler", "aria-hidden": true) %>
+                  <%= t[:exists] ? "Lock + Edit" : "Create translation + Lock" %>
+                <% end %>
+                <% if t[:exists] %>
+                  <%= button_to node_translation_path(@node, t[:locale]), method: :delete,
+                        form: { data: { confirm: "This cannot be undone. Continue?" }, class: 'button_to destructive' } do %>
+                    <%= icon("trash", library: "tabler", "aria-hidden": true) %>
+                    Destroy Translation
+                  <% end %>
+                <% end %>
+              <% end %>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    </div>
+
     <div class="node_description">People</div>
     <div class="node_content node_info_group">
       <div class="node_info_group_items">
@@ -122,7 +162,7 @@
           <div class="node_info_item">
             <span class="node_info_label">Public Preview</span>
             <% if @node.draft.preview_token.present? %>
-              <div class="preview_link_row">
+              <div class="aligned_action_row">
                 <%= link_to shared_preview_path(token: @node.draft.preview_token), shared_preview_url(token: @node.draft.preview_token), target: "_blank", rel: "noopener" %>
                 <%= button_to 'Revoke', revoke_shared_preview_node_path(@node), method: :put, form: { data: { confirm: "Revoke this preview link? Anyone currently using it will immediately lose access." }, class: 'button_to state_changing' } %>
               </div>
@@ -205,12 +245,11 @@
       </div>
     <% end %>
 
-    <div class="node_description">Abstract</div>
+    <div class="node_description">Abstract (<%= I18n.default_locale.to_s.upcase %>)</div>
     <div class="node_content"><%= sanitize(@page.abstract) %></div>
 
-    <div class="node_description">Body</div>
+    <div class="node_description">Body (<%= I18n.default_locale.to_s.upcase %>)</div>
     <div class="node_content"><%= sanitize(@page.body) %></div>
-    <%# Assets not yet addressed - no confirmed model/association seen for this page's attached assets %>
 
   </div>
 </div>
diff --git a/app/views/page_translations/edit.html.erb b/app/views/page_translations/edit.html.erb
new file mode 100644
index 0000000..7371a42
--- /dev/null
+++ b/app/views/page_translations/edit.html.erb
@@ -0,0 +1,39 @@
+<div class="translation_banner">
+  Editing the <strong><%= @locale.to_s.upcase %></strong> translation of <strong><%= title_for_node(@node) %></strong>.
+</div>
+
+<p class="field_hint">
+  Metadata such as images, tags, template, and author belong to the page
+  as a whole, not to a single translation — change those from the
+  <%= link_to 'default-locale editor', edit_node_path(@node) %>.
+</p>
+
+<div class="node_action_bar">
+  <%= button_to 'Unlock + Back', unlock_node_path(@node), method: :put,
+        form: { class: 'button_to state_changing' },
+        disabled: @node.autosave.present? %>
+  <%= submit_tag "Save #{@locale.to_s.upcase} translation", form: "translation_edit_form" %>
+  <%= submit_tag "Save + Unlock + Exit", form: "translation_edit_form" %>
+  <%= link_to "Preview ↗", preview_page_path(@page, :locale => @locale), target: "_blank", rel: "noopener", class: "preview_link" %>
+</div>
+
+<div id="page_editor">
+  <%= form_with url: node_translation_path(@node, @locale), method: :patch, local: true, id: "translation_edit_form" do |f| %>
+    <div id="content">
+      <div class="node_description">Title</div>
+      <div class="node_content">
+        <%= text_field_tag "page[title]", @translation&.title %>
+      </div>
+
+      <div class="node_description">Abstract</div>
+      <div class="node_content">
+        <%= text_area_tag "page[abstract]", @translation&.abstract %>
+      </div>
+
+      <div class="node_description">Body</div>
+      <div class="node_content">
+        <%= text_area_tag "page[body]", @translation&.body, :class => 'with_editor' %>
+      </div>
+    </div>
+  <% end %>
+</div>
diff --git a/app/views/page_translations/index.html.erb b/app/views/page_translations/index.html.erb
new file mode 100644
index 0000000..a8c4f5d
--- /dev/null
+++ b/app/views/page_translations/index.html.erb
@@ -0,0 +1,19 @@
+<h1>Translations — <%= title_for_node(@node) %></h1>
+
+<div class="node_content node_info_group">
+  <div class="node_info_group_items">
+    <% @translations.each do |t| %>
+      <div class="node_info_item">
+        <span class="node_info_label"><%= t[:locale].to_s.upcase %></span>
+        <% if t[:exists] %>
+          <%= t[:title] %> — updated <%= t[:updated_at] %>
+          <% if t[:outdated] %><span class="warning">may be outdated</span><% end %>
+          <%= link_to 'Edit', edit_node_translation_path(@node, t[:locale]) %>
+        <% else %>
+          <span class="field_hint">Not yet translated.</span>
+          <%= link_to 'Add', edit_node_translation_path(@node, t[:locale]) %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/page_translations/show.html.erb b/app/views/page_translations/show.html.erb
new file mode 100644
index 0000000..c5bd151
--- /dev/null
+++ b/app/views/page_translations/show.html.erb
@@ -0,0 +1,27 @@
+<h1>Compare — <%= title_for_node(@node) %></h1>
+
+<div class="translation_compare">
+  <div class="translation_compare_column">
+    <h2><%= @locale.to_s.upcase %></h2>
+    <div class="node_description">Title</div>
+    <div class="node_content"><%= @translation&.title %></div>
+
+    <div class="node_description">Abstract</div>
+    <div class="node_content"><%= sanitize(@translation&.abstract.to_s) %></div>
+
+    <div class="node_description">Body</div>
+    <div class="node_content"><%= sanitize(@translation&.body.to_s) %></div>
+  </div>
+
+  <div class="translation_compare_column">
+    <h2><%= I18n.default_locale.to_s.upcase %> (default)</h2>
+    <div class="node_description">Title</div>
+    <div class="node_content"><%= @default_translation&.title %></div>
+
+    <div class="node_description">Abstract</div>
+    <div class="node_content"><%= sanitize(@default_translation&.abstract.to_s) %></div>
+
+    <div class="node_description">Body</div>
+    <div class="node_content"><%= sanitize(@default_translation&.body.to_s) %></div>
+  </div>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
index 5d61bae..38a497d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -55,6 +55,12 @@ Cccms::Application.routes.draw do
           put :revert
         end
 
+        resources :translations, controller: 'page_translations',
+          param: :translation_locale,
+          constraints: { translation_locale: /en/ },
+          only: [:index, :show, :edit, :update, :destroy]
+
+
         resources :related_assets, only: [:create, :destroy, :update] do
           collection do
             get :search
diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css
index c3c0cb4..f1f4c05 100644
--- a/public/stylesheets/admin.css
+++ b/public/stylesheets/admin.css
@@ -637,6 +637,28 @@ table.revisions_table tr:hover {
   margin: 0;
 }
 
+/* ============================================================
+   Translation compare view (page_translations#show)
+   ============================================================ */
+
+.translation_compare {
+  display: flex;
+  flex-direction: column;
+  gap: 1.5rem;
+}
+
+@media(min-width:1016px) {
+  .translation_compare {
+    flex-direction: row;
+    gap: 2rem;
+  }
+
+  .translation_compare_column {
+    flex: 1;
+    min-width: 0;
+  }
+}
+
 table.user_table td.user_login {
   padding-right: 30px;
 }
@@ -834,14 +856,15 @@ form.button_to button[type="submit"] {
   font-weight: bold;
 }
 
-.preview_link_row {
+.aligned_action_row {
   display: flex;
   flex-wrap: wrap;
   align-items: start;
   gap: 0.5rem;
 }
 
-.preview_link_row form.button_to {
+.aligned_action_row .action_button,
+.aligned_action_row form.button_to {
   margin-top: -5px;
 }
 
diff --git a/test/controllers/page_translations_controller_test.rb b/test/controllers/page_translations_controller_test.rb
new file mode 100644
index 0000000..d84ac45
--- /dev/null
+++ b/test/controllers/page_translations_controller_test.rb
@@ -0,0 +1,78 @@
+require 'test_helper'
+
+class PageTranslationsControllerTest < ActionController::TestCase
+  test "index lists the default locale's existing translation and flags a missing one" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_index_test")
+    node.publish_draft!
+
+    get :index, params: { :node_id => node.id }
+
+    assert_response :success
+    assert_equal [:en], assigns(:translations).map { |t| t[:locale] }
+    assert_equal false, assigns(:translations).first[:exists]
+  end
+
+  test "update creates a first-time translation on a fresh draft, leaving head untouched" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_create_test")
+    Globalize.with_locale(:de) { node.draft.update!(:title => "Deutscher Titel") }
+    node.publish_draft!
+
+    patch :update, params: { :node_id => node.id, :translation_locale => "en", :page => { :title => "English Title" } }
+
+    node.reload
+    assert_not_nil node.draft
+    assert_includes node.draft.translated_locales, :en
+    assert_not_includes node.head.translated_locales, :en
+  end
+
+  test "no route exists for the default locale under the translations resource" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_route_constraint_test")
+
+    assert_raises(ActionController::UrlGenerationError) do
+      patch :update, params: { :node_id => node.id, :translation_locale => "de", :page => { :title => "x" } }
+    end
+  end
+
+  test "update with Save + Unlock + Exit unlocks the node and redirects to nodes#show" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_exit_test")
+
+    patch :update, params: { :node_id => node.id, :translation_locale => "en", :page => { :title => "x" }, :commit => "Save + Unlock + Exit" }
+
+    assert_nil node.reload.lock_owner
+    assert_redirected_to node_path(node)
+  end
+
+  test "update saves the translation onto the draft" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_update_test")
+    Globalize.with_locale(:en) { node.draft.update!(:title => "Original") }
+
+    patch :update, params: { :node_id => node.id, :translation_locale => "en", :page => { :title => "Revised" } }
+
+    assert_equal "Revised", Globalize.with_locale(:en) { node.draft.reload.title }
+  end
+
+  test "destroy refuses to remove the only remaining translation" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_destroy_last_test")
+    Globalize.with_locale(:en) { node.draft.update!(:title => "Only translation") }
+    node.draft.translations.where(:locale => :de).delete_all
+
+    delete :destroy, params: { :node_id => node.id, :translation_locale => "en" }
+
+    assert_equal "Can't remove the only remaining translation.", flash[:error]
+  end
+
+  test "destroy is a safe no-op, not a false success, when the translation doesn't exist" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_destroy_missing_test")
+
+    delete :destroy, params: { :node_id => node.id, :translation_locale => "en" }
+
+    assert_match(/No EN translation exists/, flash[:error])
+  end
+end
-- 
cgit v1.3


From aa14587b052a0aa7884aaf27183981975168ab14 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 13 Jul 2026 17:09:31 +0200
Subject: Wire real autosave into translation editing

The shared TinyMCE setup initializes cccms.setup_autosave() on any
page with a textarea.with_editor, unconditionally starting a
7-second interval that submits to the form's data-autosave-url --
which the translation edit form never set, so the interval PUT the
current page URL itself and 404'd on a nonexistent route.

Fixed by actually giving it something to talk to, rather than
suppressing it: a real autosave endpoint, and update now goes
through Node#autosave!/#save_draft! -- the same pipeline the
primary editor uses, fixed earlier this session for exactly this
kind of cross-locale carryover. This was the autosave-buffer parity
already flagged as due after the proof of concept; the shared JS
just forced the timing.
---
 app/controllers/page_translations_controller.rb       | 17 ++++++++++++++---
 app/views/page_translations/edit.html.erb             |  3 ++-
 config/routes.rb                                      |  7 +++++--
 test/controllers/page_translations_controller_test.rb | 19 +++++++++++++++++++
 4 files changed, 40 insertions(+), 6 deletions(-)

(limited to 'test')

diff --git a/app/controllers/page_translations_controller.rb b/app/controllers/page_translations_controller.rb
index 47f01f7..9446cd2 100644
--- a/app/controllers/page_translations_controller.rb
+++ b/app/controllers/page_translations_controller.rb
@@ -3,7 +3,7 @@ class PageTranslationsController < ApplicationController
 
   before_action :login_required
   before_action :find_node
-  before_action :find_locale, :only => [:show, :edit, :update, :destroy]
+  before_action :find_locale, :only => [:show, :edit, :update, :autosave, :destroy]
 
   def index
     page = @node.draft || @node.head
@@ -26,8 +26,8 @@ class PageTranslationsController < ApplicationController
   end
 
   def update
-    draft = ensure_editable_draft
-    Globalize.with_locale(@locale) { draft.update!(translation_params) }
+    Globalize.with_locale(@locale) { @node.autosave!(translation_params, current_user) }
+    @node.save_draft!(current_user)
     flash[:notice] = "#{@locale.upcase} translation saved. Publish the draft to make it live."
 
     if params[:commit] == "Save + Unlock + Exit"
@@ -41,6 +41,17 @@ class PageTranslationsController < ApplicationController
     redirect_to node_path(@node)
   end
 
+  def autosave
+    Globalize.with_locale(@locale) { @node.autosave!(translation_params, current_user) }
+    head :ok
+  rescue LockedByAnotherUser => e
+    render plain: e.message, status: :locked
+  rescue ActiveRecord::RecordInvalid => e
+    render plain: e.message, status: :unprocessable_entity
+  rescue StandardError => e
+    render plain: "Autosave failed", status: :internal_server_error
+  end
+
   def destroy
     base = @node.draft || @node.head
     unless base && base.translated_locales.include?(@locale)
diff --git a/app/views/page_translations/edit.html.erb b/app/views/page_translations/edit.html.erb
index 7371a42..89b594e 100644
--- a/app/views/page_translations/edit.html.erb
+++ b/app/views/page_translations/edit.html.erb
@@ -18,7 +18,8 @@
 </div>
 
 <div id="page_editor">
-  <%= form_with url: node_translation_path(@node, @locale), method: :patch, local: true, id: "translation_edit_form" do |f| %>
+    <%= form_with url: node_translation_path(@node, @locale), method: :patch, local: true, id: "translation_edit_form",
+          data: { autosave_url: autosave_node_translation_path(@node, @locale), show_url: node_path(@node) } do |f| %>
     <div id="content">
       <div class="node_description">Title</div>
       <div class="node_content">
diff --git a/config/routes.rb b/config/routes.rb
index 38a497d..826bb18 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -58,8 +58,11 @@ Cccms::Application.routes.draw do
         resources :translations, controller: 'page_translations',
           param: :translation_locale,
           constraints: { translation_locale: /en/ },
-          only: [:index, :show, :edit, :update, :destroy]
-
+          only: [:index, :show, :edit, :update, :destroy] do
+          member do
+            put :autosave
+          end
+        end
 
         resources :related_assets, only: [:create, :destroy, :update] do
           collection do
diff --git a/test/controllers/page_translations_controller_test.rb b/test/controllers/page_translations_controller_test.rb
index d84ac45..8c899fd 100644
--- a/test/controllers/page_translations_controller_test.rb
+++ b/test/controllers/page_translations_controller_test.rb
@@ -18,6 +18,7 @@ class PageTranslationsControllerTest < ActionController::TestCase
     node = Node.root.children.create!(:slug => "translations_create_test")
     Globalize.with_locale(:de) { node.draft.update!(:title => "Deutscher Titel") }
     node.publish_draft!
+    node.lock_for_editing!(users(:quentin))
 
     patch :update, params: { :node_id => node.id, :translation_locale => "en", :page => { :title => "English Title" } }
 
@@ -39,6 +40,7 @@ class PageTranslationsControllerTest < ActionController::TestCase
   test "update with Save + Unlock + Exit unlocks the node and redirects to nodes#show" do
     login_as :quentin
     node = Node.root.children.create!(:slug => "translations_exit_test")
+    node.lock_for_editing!(users(:quentin))
 
     patch :update, params: { :node_id => node.id, :translation_locale => "en", :page => { :title => "x" }, :commit => "Save + Unlock + Exit" }
 
@@ -50,6 +52,7 @@ class PageTranslationsControllerTest < ActionController::TestCase
     login_as :quentin
     node = Node.root.children.create!(:slug => "translations_update_test")
     Globalize.with_locale(:en) { node.draft.update!(:title => "Original") }
+    node.lock_for_editing!(users(:quentin))
 
     patch :update, params: { :node_id => node.id, :translation_locale => "en", :page => { :title => "Revised" } }
 
@@ -75,4 +78,20 @@ class PageTranslationsControllerTest < ActionController::TestCase
 
     assert_match(/No EN translation exists/, flash[:error])
   end
+
+  test "autosave writes the translation without creating a new revision or touching the draft" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "translations_autosave_test")
+    node.publish_draft!
+    node.lock_for_editing!(users(:quentin))
+    page_count_before = node.pages.count
+
+    put :autosave, params: { :node_id => node.id, :translation_locale => "en", :page => { :title => "in progress" } }
+
+    assert_response :success
+    node.reload
+    assert_not_nil node.autosave
+    assert_equal page_count_before, node.pages.count
+    assert_equal "in progress", Globalize.with_locale(:en) { node.autosave.title }
+  end
 end
-- 
cgit v1.3


From 40adeec1bcc6fa276d765e3b9c37e781c64a48c1 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 13 Jul 2026 17:09:45 +0200
Subject: Fix shared preview redirecting to admin for an ordinary new draft

superseded/currently_public used published_at presence as a proxy
for page-row relevance, but published_at is carried forward onto
every new draft descended from previously-published content
(Page#clone_attributes_from, Node#save_draft!) -- so it read true
for any draft on an already-published node, whether or not that
specific draft had ever gone live itself. Compare draft_id/head_id
identity directly instead; no timestamp involved. A stale
(superseded) link now redirects to the live public page rather than
an admin URL an anonymous holder can't reach anyway.
---
 app/controllers/shared_previews_controller.rb      | 16 ++++++----
 .../controllers/shared_previews_controller_test.rb | 35 ++++++++++++++++++++++
 2 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 test/controllers/shared_previews_controller_test.rb

(limited to 'test')

diff --git a/app/controllers/shared_previews_controller.rb b/app/controllers/shared_previews_controller.rb
index d482466..f6fb45a 100644
--- a/app/controllers/shared_previews_controller.rb
+++ b/app/controllers/shared_previews_controller.rb
@@ -3,13 +3,17 @@ class SharedPreviewsController < ApplicationController
     @page = Page.find_by!(preview_token: params[:token])
     node  = @page.node
 
-    was_published    = @page.published_at.present?
-    superseded       = was_published && node && node.head_id != @page.id
-    currently_public = was_published && node && node.head_id == @page.id && @page.public?
+    if node
+      is_head  = node.head_id  == @page.id
+      is_draft = node.draft_id == @page.id
 
-    if superseded || currently_public
-      redirect_to node_path(node)
-      return
+      currently_public = is_head && @page.public?
+      superseded        = !is_head && !is_draft
+
+      if superseded || currently_public
+        redirect_to @page.public_link
+        return
+      end
     end
 
     response.headers['X-Robots-Tag'] = 'noindex'
diff --git a/test/controllers/shared_previews_controller_test.rb b/test/controllers/shared_previews_controller_test.rb
new file mode 100644
index 0000000..5f2d20d
--- /dev/null
+++ b/test/controllers/shared_previews_controller_test.rb
@@ -0,0 +1,35 @@
+require 'test_helper'
+
+class SharedPreviewsControllerTest < ActionController::TestCase
+  test "renders the preview for a draft that is current but not yet head" do
+    node = Node.root.children.create!(:slug => "shared_preview_draft_test")
+    node.draft.ensure_preview_token!
+
+    get :show, params: { :token => node.draft.preview_token }
+
+    assert_response :success
+  end
+
+  test "renders the preview for a brand-new draft on an already-published node" do
+    node = Node.root.children.create!(:slug => "shared_preview_published_node_test")
+    node.publish_draft!
+    node.find_or_create_draft(User.first)
+    node.draft.ensure_preview_token!
+
+    get :show, params: { :token => node.draft.preview_token }
+
+    assert_response :success
+  end
+
+  test "redirects to the live page once the previewed draft has been published and become head" do
+    node = Node.root.children.create!(:slug => "shared_preview_now_head_test")
+    node.draft.ensure_preview_token!
+    token = node.draft.preview_token
+
+    node.publish_draft!
+
+    get :show, params: { :token => token }
+
+    assert_redirected_to node.head.public_link
+  end
+end
-- 
cgit v1.3


From 4072efdc912ecb3b79621fb1838434f792e3a531 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 13 Jul 2026 19:10:55 +0200
Subject: clone_attributes_from: update translations in place, not
 delete+recreate

Every promotion (autosave creation, draft creation, draft save) ran
every locale's translation through delete-all-then-recreate
unconditionally, giving every locale a fresh created_at/updated_at
regardless of whether its content actually changed. Confirmed via
Node.find(546).draft.translations -- both DE and EN shared one
identical timestamp despite only EN having been edited.

This silently defeated Page.find_with_outdated_translations' whole
staleness comparison: every save reset every locale back into
lockstep, so timestamps could never actually drift apart the way
the feature depends on. The existing test for it only ever passed
by manually backdating a timestamp with record_timestamps = false,
bypassing normal save flow entirely -- not something that happens
through ordinary editing.

Now updates a matching locale's translation only when its own
attributes actually differ, creates one genuinely new, and removes
one genuinely gone from the source -- same end state, but real
per-locale timestamps survive an unrelated save. search_vector is
excluded from both the comparison and the copied attributes: it's
DB-trigger-maintained from title/abstract, not real content, and
comparing a precomputed tsvector risked a false 'changed' from
representation noise alone.

Also reloads the source's translations association, not just
self's -- clone_attributes_from previously only guaranteed a fresh
self, leaving any caller holding a page reference across an earlier
mutation vulnerable to reading a stale cached association.
---
 app/models/page.rb       | 67 +++++++++++++++++++++++++-------
 test/models/page_test.rb | 99 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 153 insertions(+), 13 deletions(-)

(limited to 'test')

diff --git a/app/models/page.rb b/app/models/page.rb
index f796228..e5a8d9d 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -176,18 +176,34 @@ class Page < ApplicationRecord
     return nil unless page
 
     self.reload
+    page.translations.reload
 
     # Clone untranslated attributes
     self.tag_list         = page.tag_list
     self.template_name  ||= page.template_name
     self.published_at     = page.published_at
 
-    # Getting rid of the auto-generated empty translations
-    self.translations.delete_all
-
-    # Clone translated attributes
-    page.translations.each do |translation|
-      self.translations.create!(translation.attributes.except("id", "page_id", "created_at", "updated_at"))
+    # Clone translated attributes -- update each locale in place rather
+    # than delete-and-recreate, so a locale whose content is genuinely
+    # unchanged keeps its real created_at/updated_at instead of looking
+    # freshly touched on every single save (which was silently defeating
+    # Page.find_with_outdated_translations' whole staleness comparison).
+    # search_vector is excluded deliberately: it's DB-trigger-maintained
+    # from title/abstract, not real content, and comparing a precomputed
+    # tsvector risked a false "changed" from representation noise alone.
+    source_locales = page.translations.map(&:locale)
+    self.translations.where.not(:locale => source_locales).destroy_all
+
+    page.translations.each do |source_translation|
+      attrs = source_translation.attributes.except("id", "page_id", "created_at", "updated_at", "search_vector")
+      mine  = self.translations.find_by(:locale => source_translation.locale)
+
+      if mine
+        changed_attrs = attrs.reject { |k, v| mine.public_send(k) == v }
+        mine.update!(changed_attrs) if changed_attrs.any?
+      else
+        self.translations.create!(attrs)
+      end
     end
 
     # Clone asset references
@@ -196,19 +212,28 @@ class Page < ApplicationRecord
     self.save
   end
 
-  def diff_against other, view: :inline
+  def diff_against other, view: :inline, locale: nil
+    if locale
+      mine, theirs = translations.find_by(:locale => locale), other.translations.find_by(:locale => locale)
+      my_title, my_abstract, my_body          = mine&.title,   mine&.abstract,   mine&.body
+      their_title, their_abstract, their_body = theirs&.title, theirs&.abstract, theirs&.body
+    else
+      my_title, my_abstract, my_body          = title, abstract, body
+      their_title, their_abstract, their_body = other.title, other.abstract, other.body
+    end
+
     text_diffs =
       if view == :side_by_side
         {
-          title:    HtmlWordDiff.side_by_side(other.title.to_s,    title.to_s),
-          abstract: HtmlWordDiff.side_by_side(other.abstract.to_s, abstract.to_s),
-          body:     HtmlWordDiff.side_by_side(other.body.to_s,     body.to_s)
+          title:    HtmlWordDiff.side_by_side(their_title.to_s,    my_title.to_s),
+          abstract: HtmlWordDiff.side_by_side(their_abstract.to_s, my_abstract.to_s),
+          body:     HtmlWordDiff.side_by_side(their_body.to_s,     my_body.to_s)
         }
       else
         {
-          title:    HtmlWordDiff.inline(other.title.to_s,    title.to_s),
-          abstract: HtmlWordDiff.inline(other.abstract.to_s, abstract.to_s),
-          body:     HtmlWordDiff.inline(other.body.to_s,     body.to_s)
+          title:    HtmlWordDiff.inline(their_title.to_s,    my_title.to_s),
+          abstract: HtmlWordDiff.inline(their_abstract.to_s, my_abstract.to_s),
+          body:     HtmlWordDiff.inline(their_body.to_s,     my_body.to_s)
         }
       end
 
@@ -219,6 +244,22 @@ class Page < ApplicationRecord
     )
   end
 
+  def locale_diff_summary other
+    (translated_locales | other.translated_locales).sort_by(&:to_s).map do |locale|
+      mine   = translations.find_by(:locale => locale)
+      theirs = other.translations.find_by(:locale => locale)
+      {
+        :locale       => locale,
+        :exists_here  => mine.present?,
+        :exists_there => theirs.present?,
+        :changed      => mine.present? != theirs.present? ||
+                          mine&.title != theirs&.title ||
+                          mine&.abstract != theirs&.abstract ||
+                          mine&.body != theirs&.body
+      }
+    end
+  end
+
   def public?
     published_at.nil? ? true : published_at < Time.now
   end
diff --git a/test/models/page_test.rb b/test/models/page_test.rb
index bcddc89..24bc7c5 100644
--- a/test/models/page_test.rb
+++ b/test/models/page_test.rb
@@ -177,6 +177,56 @@ class PageTest < ActiveSupport::TestCase
     assert first_page.published_at.present?
   end
 
+  test "clone_attributes_from preserves an unchanged locale's original timestamp" do
+    n = Node.root.children.create!(:slug => "clone_preserve_timestamp_test")
+    source = n.draft
+    Globalize.with_locale(:de) { source.update!(:title => "Deutscher Titel") }
+    Globalize.with_locale(:en) { source.update!(:title => "English Title") }
+
+    target = Page.create!
+    target.clone_attributes_from(source)
+    original_en_updated_at = target.translations.find_by(:locale => :en).updated_at
+
+    Globalize.with_locale(:de) { source.update!(:title => "Deutscher Titel (bearbeitet)") }
+    target.clone_attributes_from(source)
+
+    en_translation = target.translations.find_by(:locale => :en)
+    assert_equal "English Title", en_translation.title
+    assert_equal original_en_updated_at, en_translation.updated_at
+  end
+
+  test "clone_attributes_from gives a genuinely changed locale a fresh timestamp" do
+    n = Node.root.children.create!(:slug => "clone_fresh_timestamp_test")
+    source = n.draft
+    Globalize.with_locale(:de) { source.update!(:title => "Erste Version") }
+
+    target = Page.create!
+    target.clone_attributes_from(source)
+    original_de_updated_at = target.translations.find_by(:locale => :de).updated_at
+
+    Globalize.with_locale(:de) { source.update!(:title => "Zweite Version") }
+    target.clone_attributes_from(source)
+
+    de_translation = target.translations.find_by(:locale => :de)
+    assert_equal "Zweite Version", de_translation.title
+    assert_operator de_translation.updated_at, :>, original_de_updated_at
+  end
+
+  test "clone_attributes_from removes a locale no longer present in the source" do
+    n = Node.root.children.create!(:slug => "clone_removed_locale_test")
+    source = n.draft
+    Globalize.with_locale(:en) { source.update!(:title => "English Title") }
+
+    target = Page.create!
+    target.clone_attributes_from(source)
+    assert_includes target.translations.map(&:locale), :en
+
+    source.translations.where(:locale => :en).delete_all
+    target.clone_attributes_from(source)
+
+    assert_not_includes target.reload.translations.map(&:locale), :en
+  end
+
   def test_diff_against_inline_keeps_tags_and_marks_only_the_changed_word
     n = Node.root.children.create! :slug => "diff_against_test"
     d = n.find_or_create_draft @user1
@@ -271,4 +321,53 @@ class PageTest < ActiveSupport::TestCase
     assert_equal [added_asset], diff[:assets][:added]
     assert_equal [removed_asset], diff[:assets][:removed]
   end
+
+  test "diff_against with an explicit locale compares that locale's own translation on each side" do
+    n = Node.root.children.create!(:slug => "diff_locale_test")
+    d = n.find_or_create_draft(@user1)
+    Globalize.with_locale(:en) { d.update!(:title => "Old English") }
+    d.save!
+    n.publish_draft!
+
+    d2 = n.find_or_create_draft(@user1)
+    Globalize.with_locale(:en) { d2.update!(:title => "New English") }
+    d2.save!
+
+    diff = d2.diff_against(n.head, :locale => :en)
+
+    assert_match "<del>Old</del>", diff[:title]
+    assert_match "<ins>New</ins>", diff[:title]
+  end
+
+  test "diff_against with an explicit locale ignores content in other locales entirely" do
+    n = Node.root.children.create!(:slug => "diff_locale_isolation_test")
+    d = n.find_or_create_draft(@user1)
+    d.save!
+    n.publish_draft!
+
+    d2 = n.find_or_create_draft(@user1)
+    Globalize.with_locale(:de) { d2.update!(:title => "Nur Deutsch geändert") }
+    d2.save!
+
+    diff = d2.diff_against(n.head, :locale => :en)
+
+    assert_no_match(/Deutsch/, diff[:title])
+  end
+
+  test "locale_diff_summary flags a locale that only exists on one side as changed" do
+    n = Node.root.children.create!(:slug => "diff_locale_summary_test")
+    d = n.find_or_create_draft(@user1)
+    d.save!
+    n.publish_draft!
+
+    d2 = n.find_or_create_draft(@user1)
+    Globalize.with_locale(:en) { d2.update!(:title => "New English translation") }
+    d2.save!
+
+    summary = d2.locale_diff_summary(n.head)
+    en_entry = summary.find { |s| s[:locale] == :en }
+
+    assert en_entry[:changed]
+    refute en_entry[:exists_there]
+  end
 end
-- 
cgit v1.3


From ba789678f9e8ed189413afb1446ad210df34e488 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 13 Jul 2026 19:12:56 +0200
Subject: Make revision diffs locale-aware, defaulting to whichever locale
 changed

diff_against compared title/abstract/body under whatever I18n.locale
happened to be ambient, with no concept of 'diff this translation
specifically' -- so a change confined to one locale was invisible to
Diff Head vs. Draft regardless of which locale you were looking at
when you clicked it, exactly the 'yields nothing' complaint from
earlier this session.

Page#diff_against gains a locale: keyword, additive only -- nil
preserves the exact original ambient-locale behavior every existing
caller and test already depends on; passing a locale switches to
reading each side's actual PageTranslation row directly, same
fallback-free reasoning as Page#translation_summary. Page#locale_diff_summary
reports one entry per locale present on either side, so an added or
removed translation counts as a change even where content matches
everywhere it exists on both.

RevisionsController#diff now resolves a real locale before diffing --
defaulting to whichever locale actually changed, falling back to the
default locale only when nothing did -- and the view carries that
locale through every existing control (view toggle, layer-pair
buttons, the revision-select form) so it and the view/layer-pair axis
stay independently selectable rather than resetting each other.
---
 app/controllers/revisions_controller.rb       |  7 +++++-
 app/views/revisions/diff.html.erb             | 25 +++++++++++++++++----
 test/controllers/revisions_controller_test.rb | 32 +++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 5 deletions(-)

(limited to 'test')

diff --git a/app/controllers/revisions_controller.rb b/app/controllers/revisions_controller.rb
index 4b0c549..0aed243 100644
--- a/app/controllers/revisions_controller.rb
+++ b/app/controllers/revisions_controller.rb
@@ -29,8 +29,13 @@ class RevisionsController < ApplicationController
       redirect_to(node_path(@node)) and return
     end
 
+    @locale_summary  = @end.locale_diff_summary(@start)
+    requested_locale = params[:locale].presence&.to_sym
+    default_locale    = @locale_summary.find { |s| s[:changed] }&.dig(:locale) || I18n.default_locale
+    @locale = @locale_summary.any? { |s| s[:locale] == requested_locale } ? requested_locale : default_locale
+
     @diff_view              = params[:view] == "side_by_side" ? :side_by_side : :inline
-    @diff                   = @end.diff_against(@start, view: @diff_view)
+    @diff                   = @end.diff_against(@start, view: @diff_view, locale: @locale)
     @available_layer_pairs  = @node.available_layer_pairs
     @locked_by_other        = @node.locked? && @node.lock_owner != current_user
   end
diff --git a/app/views/revisions/diff.html.erb b/app/views/revisions/diff.html.erb
index 5638b7a..149b17c 100644
--- a/app/views/revisions/diff.html.erb
+++ b/app/views/revisions/diff.html.erb
@@ -7,20 +7,37 @@
 <p class="diff_comparison_label">
   Comparing <strong><%= describe_page_reference(params[:start_revision]) %></strong>
   against <strong><%= describe_page_reference(params[:end_revision]) %></strong>
+  — showing the <strong><%= @locale.to_s.upcase %></strong> translation
 </p>
 
+<% if @locale_summary.size > 1 %>
+  <p class="diff_locale_toggle">
+    Locale:
+    <% @locale_summary.each_with_index do |s, i| %>
+      <%= " &middot; ".html_safe if i > 0 %>
+      <% label = "#{s[:locale].to_s.upcase}#{' *' if s[:changed]}" %>
+      <% if s[:locale] == @locale %>
+        <strong><%= label %></strong>
+      <% else %>
+        <%= link_to label, diff_node_revisions_path(@node, start_revision: params[:start_revision], end_revision: params[:end_revision], view: @diff_view, locale: s[:locale]) %>
+      <% end %>
+    <% end %>
+  </p>
+  <p class="field_hint">* has a difference between these two versions.</p>
+<% end %>
+
 <p class="diff_view_toggle">
   View:
   <% if @diff_view == :inline %>
     <strong>Inline</strong>
   <% else %>
-    <%= link_to 'Inline', diff_node_revisions_path(@node, start_revision: params[:start_revision], end_revision: params[:end_revision], view: 'inline') %>
+    <%= link_to 'Inline', diff_node_revisions_path(@node, start_revision: params[:start_revision], end_revision: params[:end_revision], view: 'inline', locale: @locale) %>
   <% end %>
   &middot;
   <% if @diff_view == :side_by_side %>
     <strong>Side by side</strong>
   <% else %>
-    <%= link_to 'Side by side', diff_node_revisions_path(@node, start_revision: params[:start_revision], end_revision: params[:end_revision], view: 'side_by_side') %>
+    <%= link_to 'Side by side', diff_node_revisions_path(@node, start_revision: params[:start_revision], end_revision: params[:end_revision], view: 'side_by_side', locale: @locale) %>
   <% end %>
 </p>
 
@@ -31,6 +48,7 @@
     <%= select_tag :start_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:start_revision].to_i) %>
     <%= select_tag :end_revision, options_for_select(@node.pages.map{|x| x.revision}, params[:end_revision].to_i) %>
     <%= hidden_field_tag :view, @diff_view %>
+    <%= hidden_field_tag :locale, @locale %>
     <%= submit_tag 'Diff' %>
   <% end %>
 <% else %>
@@ -44,10 +62,9 @@
       <%= button_to "Diff #{pair.first.to_s.capitalize} vs. #{pair.last.to_s.capitalize}",
             diff_node_revisions_path(@node),
             method: :get,
-            params: { start_revision: pair.first, end_revision: pair.last, view: @diff_view },
+            params: { start_revision: pair.first, end_revision: pair.last, view: @diff_view, locale: @locale },
             form: { class: 'button_to computation' } %>
     <% end %>
-
     <% if !@locked_by_other && (@node.autosave || @node.draft) %>
       <%= button_to revert_node_path(@node), method: :put,
                   params: { return_to: request.fullpath },
diff --git a/test/controllers/revisions_controller_test.rb b/test/controllers/revisions_controller_test.rb
index 76d4e8c..e5726f7 100644
--- a/test/controllers/revisions_controller_test.rb
+++ b/test/controllers/revisions_controller_test.rb
@@ -168,4 +168,36 @@ class RevisionsControllerTest < ActionController::TestCase
     assert_response :success
     assert_select "a[href=?]", node_path(@node)
   end
+
+  test "diff defaults to a locale that actually changed, not the ambient default" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "diff_default_locale_test")
+    node.draft.save!
+    node.publish_draft!
+
+    node.find_or_create_draft(@user)
+    Globalize.with_locale(:en) { node.draft.update!(:title => "Changed in English only") }
+    node.draft.save!
+
+    post(:diff, params: { :node_id => node.id, :start_revision => "head", :end_revision => "draft" })
+
+    assert_response :success
+    assert_match(/Changed/, response.body)
+  end
+
+  test "diff respects an explicitly requested locale over the auto-detected one" do
+    login_as :quentin
+    node = Node.root.children.create!(:slug => "diff_explicit_locale_test")
+    node.draft.save!
+    node.publish_draft!
+
+    node.find_or_create_draft(@user)
+    Globalize.with_locale(:en) { node.draft.update!(:title => "English changed") }
+    node.draft.save!
+
+    post(:diff, params: { :node_id => node.id, :start_revision => "head", :end_revision => "draft", :locale => "de" })
+
+    assert_response :success
+    assert_no_match(/English changed/, response.body)
+  end
 end
-- 
cgit v1.3


From 802e81f8551e10a3f97846a49636e675c7e21cb3 Mon Sep 17 00:00:00 2001
From: erdgeist <erdgeist@erdgeist.org>
Date: Mon, 13 Jul 2026 23:29:54 +0200
Subject: Add cache-buster using mtime of css and js files outside the asset
 pipeline

---
 app/helpers/admin_helper.rb              |  6 ++++++
 app/views/layouts/admin.html.erb         |  8 ++++----
 test/models/helpers/admin_helper_test.rb | 10 ++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 08336ef..1e84620 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -8,4 +8,10 @@ module AdminHelper
       link_to raw('<span class="inactive">English</span>'), url_for(params.permit(:locale, :page_path).to_h.merge('locale' => 'de'))
     end
   end
+
+  def mtime_busted_path(path)
+    file = Rails.public_path.join(path.sub(%r{\A/}, ""))
+    raise "Static asset not found for cache-busting: #{path} (looked for #{file})" unless File.exist?(file)
+    "#{path}?v=#{File.mtime(file).to_i}"
+  end
 end
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb
index 8bbc0d5..0856a0f 100644
--- a/app/views/layouts/admin.html.erb
+++ b/app/views/layouts/admin.html.erb
@@ -10,10 +10,10 @@
     <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
     <%= javascript_include_tag 'admin_bundle' %>
     <%= tinymce_assets %>
-    <link rel="stylesheet" href="/stylesheets/admin.css">
-    <script src="/javascripts/admin_search.js"></script>
-    <script src="/javascripts/admin_interface.js"></script>
-    <script src="/javascripts/related_assets.js"></script>
+    <link rel="stylesheet" href="<%= mtime_busted_path('/stylesheets/admin.css') %>">
+    <script src="<%= mtime_busted_path('/javascripts/admin_search.js') %>"></script>
+    <script src="<%= mtime_busted_path('/javascripts/admin_interface.js') %>"></script>
+    <script src="<%= mtime_busted_path('/javascripts/related_assets.js') %>"></script>
     <script>
       var ADMIN_SEARCH_URL = "<%= admin_search_path %>";
       var ADMIN_MENU_SEARCH_URL = "<%= admin_menu_search_path %>";
diff --git a/test/models/helpers/admin_helper_test.rb b/test/models/helpers/admin_helper_test.rb
index 23d9f40..94e9861 100644
--- a/test/models/helpers/admin_helper_test.rb
+++ b/test/models/helpers/admin_helper_test.rb
@@ -1,4 +1,14 @@
 require 'test_helper'
 
 class AdminHelperTest < ActionView::TestCase
+  test "mtime_busted_path appends the file's real mtime as a query param" do
+    path = "/stylesheets/admin.css"
+    expected_mtime = File.mtime(Rails.public_path.join("stylesheets/admin.css")).to_i
+
+    assert_equal "#{path}?v=#{expected_mtime}", mtime_busted_path(path)
+  end
+
+  test "mtime_busted_path raises clearly for a missing file rather than silently omitting the version" do
+    assert_raises(RuntimeError) { mtime_busted_path("/stylesheets/does_not_exist.css") }
+  end
 end
-- 
cgit v1.3