trusty-cms 7.0.23 → 7.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 513881146859a4dab77456b9db5c763511c56ef9aed99a9bbc3ad45674076b28
-  data.tar.gz: cb2331a2f2adc22be478f0fd6786faf3d126f56c36f93291ae0a052e4ddaa203
+  metadata.gz: 185eb1c3a53672bca444539bfcbb360549c22e9158be57c5463b404f0f705f57
+  data.tar.gz: c45948714f364615ac757a3ae19784bd61e1e059e0617aedc012060b2606c054
 SHA512:
-  metadata.gz: 2782c6e5eb865a8c878a4e16ce5b05c5f3e0f072095b8ebbd7ca33647041ccac24b90eedd12f652fd24d515190b93903d877e7475a3b2782d4086e0182625be5
-  data.tar.gz: 70798e27b9404a6d96559d7bfcbb3731670c9d8b2a80f92aa8b03c10b0c4a28c2fd8ca83b12ba44b67512abef82a51471bd61adf135570865980d62e3cd7c3d6
+  metadata.gz: 2bba25302dd2febb18847d30e00daeeb45421e919cb191e64894ce09d0d328a426ac041e1a13f581ede3ff6aa936f90407190d9c3653858c56139a3342a49019
+  data.tar.gz: 1d6e40435e549b2046440cff8aa1178057388b10e98a70b16fdfd42d3da4041b15f7ccb7059eafa66f7d47b09ff831040f9a73602718b1ebbdbe62cc04d3a598

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.23)
+    trusty-cms (7.0.25)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)

data/README.md

@@ -77,13 +77,17 @@ Steps:
 
         rspec
 
-### Page Type Routes Setup
-If your TrustyCMS project includes custom Page models, additional configuration is required to ensure proper URL formatting in the Admin interface. This setup allows TrustyCMS to determine the live URL of a page while editing, and to display it conveniently in the Edit Page dropdown menu.
+### Custom Page Type Routes Setup
+Additional configuration is required to ensure correct URL generation in the admin interface — specifically for the "Edit Page" dropdown and the "Save and View Draft" functionality.
 
-To enable this, create the following initializer file: `config/initializers/page_type_routes.rb`
+To enable this, create the following initializer: `config/initializers/page_type_routes.rb`
+
+In this file, define a `CUSTOM_PAGE_TYPE_ROUTES` hash constant that maps custom Page model class names to the corresponding route segments defined in your `config/routes.rb` file. For example, the BlogPage model maps to the route `get 'blog/:slug'`, so its route segment is `'blog'`.
+
+For custom Page models that rely on default routing behavior, define a `DEFAULT_PAGE_TYPE_ROUTES` array listing their class names. TrustyCMS will use these mappings to correctly build page URLs for use in the admin UI.
 
 ```ruby
-PAGE_TYPE_ROUTES = {
+CUSTOM_PAGE_TYPE_ROUTES = {
   BlogPage: 'blog',
   DonationPage: 'donate',
   ExhibitionPage: 'exhibit',
@@ -93,9 +97,14 @@ PAGE_TYPE_ROUTES = {
   ProductionPage: 'production',
   VenuePage: 'venues',
 }.freeze
-```
 
-This `PAGE_TYPE_ROUTES` constant maps custom Page model names to their corresponding route segments as defined in `config/routes.rb`. TrustyCMS will use these mappings to generate URLs for pages in the admin interface.
+DEFAULT_PAGE_TYPE_ROUTES = %w[
+  ConstituencyPage
+  FacilityPage
+  FileNotFoundPage
+  RailsPage
+].freeze
+```
 
 ### Page Status Refresh Setup
 

data/app/controllers/admin/pages_controller.rb

@@ -2,7 +2,6 @@ class Admin::PagesController < Admin::ResourceController
   before_action :initialize_meta_rows_and_buttons, only: %i[new edit create update]
   before_action :count_deleted_pages, only: [:destroy]
   before_action :set_page, only: %i[edit restore]
-  before_action :generate_view_page_url, only: [:edit]
   rescue_from ActiveRecord::RecordInvalid, with: :validation_error
   include Admin::NodeHelper
   include Admin::PagesHelper
@@ -75,10 +74,6 @@ class Admin::PagesController < Admin::ResourceController
     @page = Page.find(params[:id])
   end
 
-  def generate_view_page_url
-    @view_page_url = generate_page_url(request.url, @page)
-  end
-
   def set_site_and_homepage
     @site ||= Page.current_site
     @homepage = @site&.homepage || Page.homepage

data/app/controllers/admin/resource_controller.rb

@@ -202,19 +202,9 @@ class Admin::ResourceController < ApplicationController
   end
 
   def redirect_url
-    return edit_admin_page_url(model) if params[:continue]
     return "#{edit_admin_page_url(model)}?view_page=true" if params[:save_and_view]
 
-    admin_pages_url(site_id: model.site.id)
-  end
-
-  def index_page_for_model
-    parts = { action: 'index' }
-    if paginated? && model && i = model_class.all.index(model)
-      p = (i / pagination_parameters[:per_page].to_i) + 1
-      parts[:p] = p if p && p > 1
-    end
-    parts
+    params[:continue] ? { action: 'edit', id: model.id } : { action: 'index' }
   end
 
   def edit_model_path

data/app/helpers/admin/url_helper.rb

@@ -1,13 +1,18 @@
 module Admin::UrlHelper
   require 'uri'
 
+  def generate_page_url(url, page)
+    base_url = extract_base_url(url)
+    build_url(base_url, page)
+  end
+
   def build_url(base_url, page)
-    if page.class.name == 'Page'
-      "#{base_url}#{page.path}"
-    else
-      path = lookup_page_path(page)
-      path ? "#{base_url}/#{path}/#{page.slug}" : nil
-    end
+    return "#{base_url}#{page.path}" if default_route?(page)
+
+    path = lookup_page_path(page)
+    return nil unless path
+
+    "#{base_url}/#{path}/#{page.slug}"
   end
 
   def extract_base_url(url)
@@ -19,15 +24,14 @@ module Admin::UrlHelper
     "#{scheme}://#{host}"
   end
 
-  def generate_page_url(url, page)
-    base_url = extract_base_url(url)
-    build_url(base_url, page)
+  def default_route?(page)
+    page_class_name = page.class.name
+    page_class_name == 'Page' || (defined?(DEFAULT_PAGE_TYPE_ROUTES) && DEFAULT_PAGE_TYPE_ROUTES.include?(page_class_name))
   end
 
   def lookup_page_path(page)
-    # Use the globally defined PAGE_TYPE_ROUTES from the parent application
-    return nil unless defined?(PAGE_TYPE_ROUTES) && PAGE_TYPE_ROUTES.is_a?(Hash)
+    return nil unless defined?(CUSTOM_PAGE_TYPE_ROUTES) && CUSTOM_PAGE_TYPE_ROUTES.is_a?(Hash)
 
-    PAGE_TYPE_ROUTES[page.class.name.to_sym]
+    CUSTOM_PAGE_TYPE_ROUTES[page.class.name.to_sym]
   end
 end

data/app/models/page.rb

@@ -119,11 +119,9 @@ class Page < ActiveRecord::Base
   end
 
   def path
-    if parent?
-      parent.child_path(self)
-    else
-      clean_path(slug)
-    end
+    return '' if slug.blank?
+
+    parent? ? parent.child_path(self) : clean_path(slug)
   end
 
   alias_method :url, :path

data/app/views/admin/pages/_fields.html.haml

@@ -76,7 +76,7 @@
       = save_model_and_view_page_button(@page)
       = t('or')
       = link_to t('cancel'), admin_pages_url(site_id: @site_id), class: 'alt'
-    #view-page-url-data{ data: { url: @view_page_url } }
+    #view-page-url-data{ data: { url: @page_url } }
   - form_bottom.edit_timestamp do
     = updated_stamp @page
 

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.23'.freeze
+  VERSION = '7.0.25'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.23
+  version: 7.0.25
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-27 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator