trusty-cms 7.0.30 → 7.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ef6650284d438676ef388a1b002d3ff0acfe81dc068bcfafa9e1cb2814749f9
-  data.tar.gz: e6a980c1afa8435a04314a5b43b6788ecc4f743e9c7c32015245e15e0c8c0804
+  metadata.gz: fcafb280a56612c280982244b9a3bc76e4460aabef9ea7bb28eed7cdccfd880c
+  data.tar.gz: 281618eabbfbf3c6b14dba86edc1ce57aa5d362607c7e68f4aab09ad81a4fbca
 SHA512:
-  metadata.gz: 33d9139d690d376c8d4547b3d8c20cec750671050a9aa9378a197c3c28ab79cb04fda4403b17f2da86bdad23c5699d3dfdeef5f16db1469ad17c546464df89b8
-  data.tar.gz: f728eb8f4da2af5477ba994c9ccad2d5ac46620f0893295734a66035601c2317dc750985ec3b9d52518c786eebd1f5056a4f8dd301cb2beb4001f82e7d96835c
+  metadata.gz: bf4134454382b20f1e8bad14286963d02fa3dd7079ab3786516408e1a744514a147e58bfdd3f4ae60c2e355f252aa4bc6cab8fb22a8315f924aba6303a9f30ac
+  data.tar.gz: 27bce35c3fb49517d7af5825049bf68e40ca0af29c117f60aca5066c005080cc5e8e3fa4c60dc78691d9c5898299f5b3c286851bd6a23644c7253b3478cc7a1a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.30)
+    trusty-cms (7.0.32)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)
@@ -12,6 +12,7 @@ PATH
       delocalize (>= 0.2, < 2.0)
       devise
       devise-two-factor
+      diffy
       drb
       execjs (~> 2.7)
       haml (>= 5.0, < 6.0)
@@ -168,6 +169,7 @@ GEM
       railties (>= 7.0, < 8.1)
       rotp (~> 6.0)
     diff-lcs (1.5.1)
+    diffy (3.4.4)
     docile (1.4.1)
     drb (2.2.1)
     erubi (1.13.0)
@@ -246,6 +248,7 @@ GEM
     mime-types-data (3.2024.1105)
     mini_magick (4.13.2)
     mini_mime (1.1.5)
+    mini_portile2 (2.8.9)
     mini_racer (0.16.0)
       libv8-node (~> 18.19.0.0)
     minitest (5.25.4)
@@ -264,17 +267,24 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.17.2-aarch64-linux)
+    nokogiri (1.18.8)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.17.2-arm-linux)
+    nokogiri (1.18.8-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.17.2-arm64-darwin)
+    nokogiri (1.18.8-aarch64-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.17.2-x86-linux)
+    nokogiri (1.18.8-arm-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.17.2-x86_64-darwin)
+    nokogiri (1.18.8-arm-linux-musl)
       racc (~> 1.4)
-    nokogiri (1.17.2-x86_64-linux)
+    nokogiri (1.18.8-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.8-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.8-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.8-x86_64-linux-musl)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     paper_trail (16.0.0)

data/app/assets/javascripts/admin/recent-changes.js

@@ -0,0 +1,17 @@
+document.addEventListener("DOMContentLoaded", () => {
+  document.querySelectorAll(".toggle-diff").forEach(link => {
+    link.addEventListener("click", event => {
+      event.preventDefault();
+
+      const targetId = link.dataset.toggle;
+      const row = document.getElementById(targetId);
+      if (!row) return;
+
+      const isHidden = window.getComputedStyle(row).display === "none";
+      row.style.display = isHidden ? "table-row" : "none";
+
+      link.textContent = isHidden ? "Hide Diff" : "Show Diff";
+      link.setAttribute("aria-expanded", isHidden.toString());
+    });
+  });
+});

data/app/assets/javascripts/admin.js

@@ -29,6 +29,7 @@
 //= require 'admin/pagefield'
 //= require 'admin/popup'
 //= require 'admin/preview'
+//= require 'admin/recent-changes'
 //= require 'admin/tabcontrol'
 //= require 'admin/utilities'
 //= require 'admin/tags'

data/app/assets/stylesheets/admin/main.scss

@@ -28,6 +28,7 @@
 @import "partials/treetable";
 @import "partials/login_form";
 @import "partials/previous_versions";
+@import "partials/recent_changes";
 @import "multi_site_main";
 @import "site_chooser";
 

data/app/assets/stylesheets/admin/partials/_preferences.scss

@@ -24,7 +24,7 @@
   }
 }
 
-#display_password {
+#display-password {
   .button {
     display: block;
     max-width: fit-content;

data/app/assets/stylesheets/admin/partials/_recent_changes.scss

@@ -0,0 +1,80 @@
+.diff {
+    overflow: visible;
+  }
+  
+  .diff ul {
+    background: #fff;
+    display: table;
+    font-size: 13px;
+    list-style: none;
+    margin: 0;
+    overflow: auto;
+    padding: 0;
+    width: 100%;
+  }
+  
+  .diff li {
+    display: table-row;
+    height: 1em;
+    margin: 0;
+    padding: 0;
+  }
+  
+  .diff li.ins {
+    background: #dfd;
+    color: #080;
+  }
+  
+  .diff li.del {
+    background: #fee;
+    color: #b00;
+  }
+  
+  .diff del,
+  .diff ins,
+  .diff span {
+    display: block;
+    font-family: courier;
+    text-decoration: none;
+    white-space: pre-wrap;
+  }
+  
+  .diff del strong {
+    background: #fcc;
+    font-weight: normal;
+  }
+  
+  .diff ins strong {
+    background: #9f9;
+    font-weight: normal;
+  }
+  
+  .diff li.diff-comment {
+    display: none;
+  }
+  
+  .diff li.diff-block-info {
+    background: gray;
+  }
+  
+  .dynamic-diff-row {
+    display: none;
+  }
+  
+  table#recent-changes {
+    width: 100%;
+  }
+  
+  table#recent-changes td {
+    overflow-wrap: break-word;
+    padding: 12px;
+    word-break: break-word;
+  }
+  
+  table#recent-changes tr:hover.diff-row td {
+    background: none !important;
+  }
+  
+  table#recent-changes tr:hover.dynamic-diff-row td {
+    background: none !important;
+  }

data/app/assets/stylesheets/admin/partials/_table.scss

@@ -7,7 +7,6 @@
   width: $width;
 }
 
-
 table {
   th {
     background-color: $light-gray;
@@ -51,23 +50,23 @@ table {
       color: $dark-gray;
       text-decoration: none;
 
+      &.selected,
       &:hover {
         background: $light-gray;
         border: 1px solid darken($light-gray, 10%);
         margin: 0 24px 0 0;
       }
-
-      &.selected {
-        background: $light-gray;
-        border: 1px solid darken($light-gray, 10%);
-        margin: 0 24px 0 0;
-      }
     }
 
     span.action.disabled {
       color: #cccccc;
     }
 
+    &.actions {
+      font-size: 85%;
+      white-space: nowrap;
+    }
+
     &.empty {
       color: silver;
       font-style: italic;
@@ -83,10 +82,12 @@ table {
         text-decoration: none;
       }
     }
+  }
 
-    &.actions {
-      font-size: 85%;
-      white-space: nowrap;
+  thead {
+    tr,
+    tr:first-child {
+      border-top: none;
     }
   }
 
@@ -104,17 +105,17 @@ table {
       }
     }
   }
-
-  thead {
-    tr,
-    tr:first-child {
-      border-top: none;
-    }
-  }
 }
 
 table.index#pages {
   td.name {
+    .info {
+      color: #9eb3bf;
+      font-size: 0.90em;
+      font-style: italic;
+      font-weight: normal;
+    }
+
     .w1 {
       position: relative;
 
@@ -124,24 +125,35 @@ table.index#pages {
         position: absolute;
       }
     }
+  }
 
-    .info {
-      color: #9eb3bf;
-      font-size: 0.90em;
-      font-style: italic;
-      font-weight: normal;
-    }
+  td.status {
+    font-size: 0.80em;
   }
 
   tr.page.virtual td.name a .title {
     color: #9eb3bf;
   }
+}
 
-  td.status {
-    font-size: .80em;
+table.index#users {
+  td.name {
+    padding-bottom: 8px;
+    padding-top: 8px;
+
+    .login {
+      color: #9eb3bf;
+      font-size: 90%;
+      font-style: italic;
+      font-weight: normal;
+    }
   }
 }
 
+table#versions-table td {
+  padding: 12px;
+}
+
 .status {
   a {
     @include plain-link;
@@ -155,17 +167,3 @@ table.index#pages {
 .hidden_status {
   @include status-badge(#9eb3bf);
 }
-
-table.index#users {
-  td.name {
-    padding-bottom: 8px;
-    padding-top: 8px;
-
-    .login {
-      color: #9eb3bf;
-      font-size: 90%;
-      font-style: italic;
-      font-weight: normal;
-    }
-  }
-}

data/app/controllers/admin/changes_controller.rb

@@ -0,0 +1,118 @@
+require 'diffy'
+
+class Admin::ChangesController < Admin::ResourceController
+  before_action :initialize_variables
+
+  def show
+    @changes = load_changes
+    @change_error = 'Version ID not found.' if params[:version_id].present? && @changes.empty?
+  end
+
+  private
+
+  def load_changes
+    return load_single_change if params[:version_id].present?
+
+    load_recent_changes
+  end
+
+  def load_single_change
+    version = PaperTrail::Version.find_by(id: params[:version_id])
+    version ? [build_change_entry(version)] : []
+  end
+
+  def load_recent_changes
+    fetch_recent_page_versions.map { |version| build_change_entry(version) }
+  end
+
+  def fetch_recent_page_versions
+    PaperTrail::Version.
+      where(item_type: 'Page').
+      joins('INNER JOIN pages ON pages.id = versions.item_id').
+      where(pages: { site_id: current_site.id }).
+      where('versions.created_at >= ?', 1.month.ago).
+      order(created_at: :desc).
+      limit(25)
+  end
+
+  def build_change_entry(version)
+    page = Page.find_by(id: version.item_id)
+    return {} unless page
+
+    {
+      action: version.event.titleize,
+      diff: build_diff(version),
+      id: version.id,
+      page_title: page.title,
+      page_url: admin_page_url(page),
+      updated_at: format_timestamp(version.created_at),
+      user_name: user_name(version.whodunnit),
+    }
+  end
+
+  def build_diff(version)
+    related_versions = PaperTrail::Version.where(transaction_id: version.transaction_id)
+    diffs = related_versions.flat_map { |v| diff_fields(v) }.compact
+    diffs.any? ? diffs.join('<br />') : nil
+  end
+
+  def diff_fields(version)
+    version.changeset.map do |field, (old_val, new_val)|
+      next unless renderable_diff?(field, old_val, new_val)
+
+      render_field_diff(version, field, old_val, new_val)
+    end
+  end
+
+  def renderable_diff?(field, old_val, new_val)
+    !ignored_fields.include?(field) && !(old_val.nil? && new_val == '')
+  end
+
+  def render_field_diff(version, field, old_val, new_val)
+    diff_html = Diffy::Diff.new(old_val, new_val, context: 1).to_s(:html)
+
+    label = version.item_type == 'Page' ? field : label_for_version(version)
+    "<h2>#{label.humanize.titleize}</h2>#{diff_html}"
+  end
+
+  def ignored_fields
+    %w[
+      created_at
+      created_by_id
+      id
+      lock_version
+      name
+      page_id
+      published_at
+      updated_at
+      updated_by_id
+    ].freeze
+  end
+
+  def user_name(whodunnit)
+    user_id = Integer(whodunnit, exception: false)
+    User.find_by(id: user_id)&.name || 'Unknown User'
+  end
+
+  def label_for_version(version)
+    case version.item_type
+    when 'PagePart' then PagePart.find_by(id: version.item_id)&.name || 'Unknown PagePart'
+    when 'PageField' then PageField.find_by(id: version.item_id)&.name || 'Unknown PageField'
+    else version.item_type
+    end
+  end
+
+  def format_timestamp(timestamp)
+    timestamp.strftime('%A, %B %d, %I:%M %p')
+  end
+
+  def admin_page_url(page)
+    "/admin/pages/#{page.id}"
+  end
+
+  def initialize_variables
+    @user = current_user
+    @controller_name = 'changes'
+    @template_name = 'show'
+  end
+end

data/app/controllers/admin/pages_controller.rb

@@ -134,6 +134,7 @@ class Admin::PagesController < Admin::ResourceController
       .sort_by(&:created_at).reverse
       .map do |version|
       {
+        id: version&.id,
         index: version&.index,
         update_date: version&.created_at&.strftime('%B %d, %Y'),
         update_time: version&.created_at&.strftime('%I:%M %p'),

data/app/controllers/admin/resource_controller.rb

@@ -9,6 +9,7 @@ class Admin::ResourceController < ApplicationController
   before_action :load_models, only: :index
   before_action :load_model, only: %i[new create edit update remove destroy]
   before_action :set_owner_or_editor, only: %i[new create update]
+  before_action :set_page_updated_at, only: :update
   after_action :clear_model_cache, only: %i[create update destroy]
 
   cattr_reader :paginated
@@ -145,6 +146,12 @@ class Admin::ResourceController < ApplicationController
     end
   end
 
+  def set_page_updated_at
+    if model.class.name.include?('Page') && model.has_attribute?(:updated_at)
+      model.updated_at = Time.zone.now
+    end
+  end
+
   def model
     instance_variable_get("@#{model_symbol}") || load_model
   end

data/app/helpers/admin/pages_helper.rb

@@ -25,4 +25,10 @@ module Admin::PagesHelper
     selected_page_id = page.parent_id
     options_for_select(parent_pages.map { |p| [p.title, p.id] }, selected_page_id)
   end
+
+  def revert_confirmation_message(version)
+    date = version[:update_date]
+    time = version[:update_time]
+    "Are you sure you want to revert the page to the version before the change made on #{date} at #{time}? All changes made after that will be lost."
+  end
 end

data/app/models/page.rb

@@ -1,8 +1,6 @@
 require 'trusty_cms/taggable'
 
 class Page < ActiveRecord::Base
-  has_paper_trail
-
   class MissingRootPageError < StandardError
     def initialize(message = 'Database missing root page')
       ; super
@@ -22,6 +20,8 @@ class Page < ActiveRecord::Base
   belongs_to :created_by, class_name: 'User'
   belongs_to :updated_by, class_name: 'User'
 
+  has_paper_trail
+
   # Validations
   validates_presence_of :title, :slug, :breadcrumb, :status_id
 
@@ -40,6 +40,7 @@ class Page < ActiveRecord::Base
 
   annotate :description
   attr_accessor :request, :response, :pagination_parameters
+
   class_attribute :default_child
   self.default_child = self
 
@@ -264,11 +265,11 @@ class Page < ActiveRecord::Base
         @display_name = string
       else
         @display_name ||= begin
-                            n = name.to_s
-                            n.sub(/^(.+?)Page$/, '\1')
-                            n.gsub(/([A-Z])/, ' \1')
-                            n.strip
-                          end
+          n = name.to_s
+          n.sub(/^(.+?)Page$/, '\1')
+          n.gsub(/([A-Z])/, ' \1')
+          n.strip
+        end
       end
       @display_name = @display_name + ' - not installed' if missing? && @display_name !~ /not installed/
       @display_name

data/app/models/page_part.rb

@@ -1,12 +1,12 @@
 class PagePart < ActiveRecord::Base
-  has_paper_trail
-
   # Default Order
   default_scope { order('name') }
 
   # Associations
   belongs_to :page
 
+  has_paper_trail
+
   # Validations
   validates_presence_of :name
   validates_length_of :name, maximum: 100

data/app/views/admin/changes/show.html.haml

@@ -0,0 +1,57 @@
+- @page_title = 'Changes - ' + default_page_title
+- single_change = params[:version_id].present?
+
+.outset
+  = render_region :top
+
+  %table#recent-changes
+    %thead
+      %tr
+        %th Version ID
+        %th Title
+        %th Action
+        %th User
+        %th Updated At
+
+    %tbody
+      - if @change_error
+        %tr
+          %td{ colspan: 5 }
+            %span.text-danger= @change_error
+
+      - elsif @changes.present?
+        - @changes.each_with_index do |change, index|
+          %tr.change-row{ data: { toggle_target: "diff-#{index}" } }
+            %td= change[:id]
+            %td= link_to change[:page_title], change[:page_url]
+            %td= change[:action]
+            %td= change[:user_name]
+            %td
+              = change[:updated_at]
+              - unless single_change
+                %br
+                %a.toggle-diff{
+                  href: "#",
+                  role: "button",
+                  tabindex: "0",
+                  aria: {
+                    expanded: "false",
+                    controls: "diff-#{index}"
+                  },
+                  data: { toggle: "diff-#{index}" }
+                } Show Diff
+
+          - diff_row_id = single_change ? nil : "diff-#{index}"
+          - diff_row_class = single_change ? 'diff-row' : 'dynamic-diff-row'
+          %tr{ id: diff_row_id, class: diff_row_class, role: "region", "aria-live" => "polite" }
+            %td{ colspan: 5 }
+              - if change[:diff].present?
+                != change[:diff]
+              - else
+                %span.text-muted No differences found.
+                %span.sr-only Diff details for version ID #{change[:id]}.
+
+      - else
+        %tr
+          %td{ colspan: 5 }
+            %span No recent changes.

data/app/views/admin/configuration/show.html.haml

@@ -19,7 +19,7 @@
         %span
           = current_user.locale
       .actions
-        = button_to t("edit_preferences"), edit_admin_user_path(current_user), :method => :get
+        = button_to t("edit_preferences"), admin_preferences_path, :method => :get
 
 %fieldset
   - render_region :user do |user|

data/app/views/admin/layouts/_site_chooser.html.haml

@@ -1,4 +1,4 @@
-- if current_user.scoped_site? && defined?(Site) && defined?(controller) && controller.sited_model? && Site.several?
+- if current_user.scoped_site? && defined?(Site) && defined?(controller) && Site.several?
   .site_chooser
     %ul.nav
       %li

data/app/views/admin/pages/_previous_versions.haml

@@ -3,31 +3,40 @@
     %h4
       %i.fas.fa-clock-rotate-left
       Previous Versions
+
     .drawer_contents#versions
       - if @versions.present?
         %section
-          %table
+          %table#versions-table
             %thead
               %tr
+                %th Version ID
                 %th Date Updated
                 %th Time Updated
                 %th Updated By
                 %th Action
-            %tbody{ :id => 'versions-table' }
+            %tbody
               - @versions.each do |version|
                 %tr
+                  %td= link_to version[:id], admin_changes_path(version_id: version[:id])
                   %td= version[:update_date]
                   %td= version[:update_time]
                   %td= version[:updated_by]
                   %td
-                    = button_to 'Restore', 
+                    = button_to 'Undo',
                       restore_version_admin_page_path(@page, version_index: version[:index]),
                       method: :put,
-                      data: { confirm: 'Are you sure you want to restore this version?' }
+                      class: 'btn btn-warning',
+                      data: { confirm: revert_confirmation_message(version) }
       - else
         %section#no-previous-versions
           %p No previous versions are available.
+
     .drawer_handle
-      %a.toggle{:href=>'#versions', :rel=>'toggle[versions]', :class=>"#{(meta_errors? ? 'less' : 'more')}"}
+      %a.toggle{
+        href: '#versions',
+        rel: 'toggle[versions]',
+        class: (meta_errors? ? 'less' : 'more')
+      }
         = meta_label
         %i.fas.fa-angle-down

data/app/views/admin/users/_form.html.haml

@@ -15,6 +15,9 @@
       = f.label :email, t('email_address') , :class => 'optional'
       = f.text_field 'email', :class => 'textbox', :maxlength => 255
 
+    - form.edit_password do
+      = render 'password_fields', :f => f
+
     - form.edit_roles do
       - if current_user.admin?
         %fieldset.multi_option

data/app/views/admin/users/_password_fields.html.haml

@@ -0,0 +1,14 @@
+%fieldset#display-password{ :style => (@user.new_record? or !@user.valid?) ? 'display: none' : nil }
+  %label= t('password')
+  %a.button{ :href => '#', :onclick => "$('#display-password').hide(); $('#change-password').show()" }= t('change')
+%fieldset#change-password{ :style => (!@user.new_record? && @user.valid?) ? 'display: none' : nil }
+  %p
+    = f.label :password, t('new_password')
+    = f.password_field 'password', :value => '', :maxlength => 40, :autocomplete => 'new-password'
+  %p
+    = f.label :password_confirmation, t('password_confirmation')
+    = f.password_field 'password_confirmation', :value => '', :maxlength => 40, :autocomplete => 'new-password'
+    - unless @user.new_record?
+      %span
+        = t('or')
+        %a{ :href => '#', :class => 'cancel-button', :onclick => " $('#display-password').show(); $('#change-password').hide()" }= t('cancel', class: 'alt')

data/config/routes.rb

@@ -43,6 +43,7 @@ TrustyCms::Application.routes.draw do
   get 'admin' => 'admin/pages#index'
 
   namespace :admin do
+    resource :changes
     resource :preferences
     resource :two_factor, only: [:show, :create], controller: 'two_factor', path: 'two-factor'
     resource :security, controller: 'security' do

data/db/migrate/20250606144908_add_object_changes_to_versions.trusty_cms.rb

@@ -0,0 +1,8 @@
+class AddObjectChangesToVersions < ActiveRecord::Migration[7.0]
+  # The largest text column available in all supported RDBMS.
+  TEXT_BYTES = 1_073_741_823
+
+  def change
+    add_column :versions, :object_changes, :text, limit: TEXT_BYTES
+  end
+end

data/lib/trusty_cms/admin_ui.rb

@@ -70,7 +70,8 @@ module TrustyCms
       end
 
       def deprecated_add(name, url, caller)
-        ActiveSupport::Deprecation.warn("admin.tabs.add is no longer supported in TrustyCms 0.9.x.  Please update your code to use: \ntab \"Content\" do\n\tadd_item(...)\nend", caller)
+        ActiveSupport::Deprecation.warn("admin.tabs.add is no longer supported in TrustyCms 0.9.x.  Please update your code to use: \ntab \"Content\" do\n\tadd_item(...)\nend",
+                                        caller)
         NavSubItem.new(name, url)
       end
     end
@@ -123,7 +124,7 @@ module TrustyCms
     end
 
     # Region sets
-    %w{page layout user configuration extension}.each do |controller|
+    %w{page layout user changes configuration extension}.each do |controller|
       attr_accessor controller
       alias_method "#{controller}s", controller
     end
@@ -147,6 +148,10 @@ module TrustyCms
       design << nav_item('Layouts', '/admin/layouts')
       nav << design
 
+      changes = nav_tab('Recent Changes')
+      changes << nav_item('Changes', '/admin/changes')
+      nav << changes
+
       settings = nav_tab('Settings')
       settings << nav_item('General', '/admin/configuration')
       settings << nav_item('Personal', '/admin/preferences')
@@ -159,6 +164,7 @@ module TrustyCms
     def load_default_regions
       @page = load_default_page_regions
       @layout = load_default_layout_regions
+      @changes = load_default_changes_regions
       @user = load_default_user_regions
       @configuration = load_default_configuration_regions
       @extension = load_default_extension_regions
@@ -201,7 +207,7 @@ module TrustyCms
         end
         user.edit = RegionSet.new do |edit|
           edit.main.concat %w{edit_header edit_form}
-          edit.form.concat %w{edit_first_name edit_last_name edit_email edit_roles edit_notes}
+          edit.form.concat %w{edit_first_name edit_last_name edit_email edit_password edit_roles edit_notes}
           edit.form_bottom.concat %w{edit_buttons edit_timestamp}
         end
         user.index = RegionSet.new do |index|
@@ -232,6 +238,14 @@ module TrustyCms
       end
     end
 
+    def load_default_changes_regions
+      OpenStruct.new.tap do |changes|
+        changes.show = RegionSet.new do |show|
+          show.top.concat %w{}
+        end
+      end
+    end
+
     def load_default_configuration_regions
       OpenStruct.new.tap do |configuration|
         configuration.show = RegionSet.new do |show|

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.30'.freeze
+  VERSION = '7.0.32'.freeze
 end

data/trusty_cms.gemspec

@@ -34,6 +34,7 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'delocalize', '>= 0.2', '< 2.0'
   s.add_dependency 'devise'
   s.add_dependency 'devise-two-factor'
+  s.add_dependency 'diffy'
   s.add_dependency 'drb'
   s.add_dependency 'execjs', '~> 2.7'
   s.add_dependency 'haml', '>= 5.0', '< 6.0'

data/vendor/extensions/multi-site-extension/lib/multi_site/pages_controller_extensions.rb

@@ -10,7 +10,7 @@ module MultiSite::PagesControllerExtensions
       alias_method :remove, :remove_with_back
       responses.destroy.default do
         session[:came_from] = nil
-        redirect_to admin_pages_url(site_id: model.site.id)
+        redirect_to admin_pages_path
       end
     }
   end

data/vendor/extensions/multi-site-extension/multi_site_extension.rb

@@ -21,10 +21,12 @@ class MultiSiteExtension < TrustyCms::Extension
     Admin::PagesController.send :include, MultiSite::PagesControllerExtensions
     Admin::ResourceController.send :helper, MultiSite::SiteChooserHelper
     Admin::PagesController.send :helper, MultiSite::SiteChooserHelper
+    Admin::ChangesController.send :helper, MultiSite::SiteChooserHelper
     admin.layouts.index.add(:before_nav, "admin/layouts/site_chooser")
     admin.pages.index.add(:before_nav, "admin/layouts/site_chooser")
     admin.snippets.index.add(:before_nav, "admin/layouts/site_chooser")
     admin.pages.search.add(:before_nav, "admin/layouts/site_chooser")
+    admin.changes.show.add(:before_nav, "admin/layouts/site_chooser")
     Layout.send :is_site_scoped
     Snippet.send :is_site_scoped
     User.send :is_site_scoped, :shareable => true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.30
+  version: 7.0.32
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-19 00:00:00.000000000 Z
+date: 2025-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -154,6 +154,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: drb
   requirement: !ruby/object:Gem::Requirement
@@ -731,6 +745,7 @@ files:
 - app/assets/javascripts/admin/persist.min.js
 - app/assets/javascripts/admin/popup.js
 - app/assets/javascripts/admin/preview.js
+- app/assets/javascripts/admin/recent-changes.js
 - app/assets/javascripts/admin/sortable.js
 - app/assets/javascripts/admin/tabcontrol.js.erb
 - app/assets/javascripts/admin/tags.js
@@ -765,6 +780,7 @@ files:
 - app/assets/stylesheets/admin/partials/_popup.scss
 - app/assets/stylesheets/admin/partials/_preferences.scss
 - app/assets/stylesheets/admin/partials/_previous_versions.scss
+- app/assets/stylesheets/admin/partials/_recent_changes.scss
 - app/assets/stylesheets/admin/partials/_sidebar.scss
 - app/assets/stylesheets/admin/partials/_tabcontrol.scss
 - app/assets/stylesheets/admin/partials/_table.scss
@@ -773,6 +789,7 @@ files:
 - app/assets/stylesheets/admin/partials/_typography.scss
 - app/assets/stylesheets/admin/partials/_validations.scss
 - app/controllers/admin/assets_controller.rb
+- app/controllers/admin/changes_controller.rb
 - app/controllers/admin/configuration_controller.rb
 - app/controllers/admin/extensions_controller.rb
 - app/controllers/admin/layouts_controller.rb
@@ -848,6 +865,7 @@ files:
 - app/views/admin/assets/index.html.haml
 - app/views/admin/assets/new.html.haml
 - app/views/admin/assets/remove.html.haml
+- app/views/admin/changes/show.html.haml
 - app/views/admin/configuration/_clipped_edit.html.haml
 - app/views/admin/configuration/_clipped_show.html.haml
 - app/views/admin/configuration/edit.html.haml
@@ -908,6 +926,7 @@ files:
 - app/views/admin/two_factor/show.html.haml
 - app/views/admin/users/_choose_site.html.haml
 - app/views/admin/users/_form.html.haml
+- app/views/admin/users/_password_fields.html.haml
 - app/views/admin/users/edit.html.haml
 - app/views/admin/users/index.html.haml
 - app/views/admin/users/new.html.haml
@@ -1001,6 +1020,7 @@ files:
 - db/migrate/20250103191133_create_version_associations.rb
 - db/migrate/20250103191134_add_transaction_id_column_to_versions.rb
 - db/migrate/20250502162215_add_devise_two_factor_to_admins.rb
+- db/migrate/20250606144908_add_object_changes_to_versions.trusty_cms.rb
 - db/schema.rb
 - lib/active_record_extensions/active_record_extensions.rb
 - lib/annotatable.rb