trusty-cms 7.0.19 → 7.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d37b90774a4c87ae80254d2a3729921f05098db89c5f64acdcfc11e81f2b5c71
-  data.tar.gz: 7f824c9d8f95202c6a094caf6e2ab2ee90c57a2ad6df665d1f2225d7e5a73fe3
+  metadata.gz: 560be4f9866faaea507a2120b4482e910fc41c8382f048f25a601a41b9f622d7
+  data.tar.gz: 54a5e403b5d9d8d0a19aed38d5ae9e11f80aab37f97a02cc9c1161aa4da96048
 SHA512:
-  metadata.gz: 1c18e2566d7bdf42b36746d6e4cfa5030a4c6eb5892cfdd2aa3d4d05a51de4758258347c009f18f5624cd12b70038d0b67541b48fee2d92f0ca321a1605c40ff
-  data.tar.gz: 760b7480db6eaca5f5583c5937096ea19439e12f379dec6ea80808d76f2375107a43079dcd7852dd2ae94bcdf4d9e2ec3fcb05cfa768a6e0e070db865dced0b4
+  metadata.gz: 7163176299de8e165849f47d372432a720de5e38aaacd340c213f6539c51103a87d2eafcdf1c6cdf31ec03123c976d8ef794c6ec66601543060f3a1f16601d59
+  data.tar.gz: 63a8dcdddae7c1fadb2ba766f141ae11ffba41771ba5f43929352c3a9bce6cb5e490bc62a305d8948dd240f96d00570b0adf4b2c1d8d3f5ae9fdc6054e70668d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (7.0.19)
+    trusty-cms (7.0.21)
       RedCloth (= 4.3.3)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.3.0)
@@ -36,6 +36,7 @@ PATH
       stringex (>= 2.7.1, < 2.9.0)
       tzinfo (>= 1.2.3, < 2.1.0)
       uglifier (>= 3.2, < 5.0)
+      uri
       will_paginate (>= 3, < 5)
 
 GEM
@@ -402,6 +403,7 @@ GEM
       concurrent-ruby (~> 1.0)
     uglifier (4.2.1)
       execjs (>= 0.3.0, < 3)
+    uri (1.0.2)
     warden (1.2.9)
       rack (>= 2.0.9)
     websocket-driver (0.7.6)

data/README.md

@@ -77,6 +77,25 @@ 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.
+
+To enable this, create the following initializer file: `config/initializers/page_type_routes.rb`
+
+```ruby
+PAGE_TYPE_ROUTES = {
+  BlogPage: 'blog',
+  DonationPage: 'donate',
+  ExhibitionPage: 'exhibit',
+  NonTicketedEventPage: 'event',
+  PackagePage: 'package',
+  PersonPage: 'biography',
+  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.
 
 ### Page Status Refresh Setup
 

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

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

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

@@ -0,0 +1,18 @@
+#previous-versions .drawer_handle {
+  padding-top: 0;
+}
+
+#previous-versions h4 {
+  margin-bottom: 0.5em;
+  margin-top: 0;
+  padding-bottom: 0.25em;
+  padding-top: 0;
+}
+
+#previous-versions th {
+  text-align: center;
+}
+
+#previous-versions #no-previous-versions {
+  padding-bottom: 0.5em;
+}

data/app/controllers/admin/pages_controller.rb

@@ -3,7 +3,9 @@ class Admin::PagesController < Admin::ResourceController
   before_action :count_deleted_pages, only: [:destroy]
   before_action :set_page, only: %i[edit restore]
   rescue_from ActiveRecord::RecordInvalid, with: :validation_error
+  include Admin::NodeHelper
   include Admin::PagesHelper
+  include Admin::UrlHelper
 
   class PreviewStop < ActiveRecord::Rollback
     def message
@@ -33,7 +35,7 @@ class Admin::PagesController < Admin::ResourceController
     @site_id = params[:site_id] || Page.current_site.id
     @q = initialize_search
 
-    @pages = fetch_search_results if search_title_present?
+    @pages = fetch_search_results if search_query_present?
     render
   end
 
@@ -48,6 +50,8 @@ class Admin::PagesController < Admin::ResourceController
   def edit
     verify_site_id
     load_assets
+    @page_url = generate_page_url(request.url, @page)
+    @page_path = format_path(@page.path)
     @versions = format_versions(@page.versions)
     response_for :edit
   end
@@ -83,8 +87,9 @@ class Admin::PagesController < Admin::ResourceController
   end
 
   def verify_site_id
-    @site_id = params[:site_id]&.to_i
-    unless @site_id && @page&.site_id == @site_id
+    page_site_id = @page.site_id
+    user_site_ids = current_user.admins_sites.each.pluck(:site_id)
+    unless user_site_ids.include?(page_site_id)
       redirect_to admin_pages_url
     end
   end
@@ -100,12 +105,13 @@ class Admin::PagesController < Admin::ResourceController
   end
 
   def fetch_search_results
-    @title = params.dig(:search, :title)
-    Page.ransack(title_cont: @title, site_id_eq: @site_id).result
+    @query = params.dig(:search, :query)
+    Page.ransack(title_cont: @query, site_id_eq: @site_id).result
+      .or(Page.ransack(slug_cont: @query, site_id_eq: @site_id).result)
   end
 
-  def search_title_present?
-    params.dig(:search, :title).present?
+  def search_query_present?
+    params.dig(:search, :query).present?
   end
 
   def validation_error(e)

data/app/helpers/admin/url_helper.rb

@@ -0,0 +1,33 @@
+module Admin::UrlHelper
+  require 'uri'
+
+  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
+  end
+
+  def extract_base_url(url)
+    uri = URI.parse(url)
+    host = uri.host
+    scheme = uri.scheme
+    return "#{scheme}://#{host}:#{uri.port}" if host&.include?('localhost')
+
+    "#{scheme}://#{host}"
+  end
+
+  def generate_page_url(url, page)
+    base_url = extract_base_url(url)
+    build_url(base_url, page)
+  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)
+
+    PAGE_TYPE_ROUTES[page.class.name.to_sym]
+  end
+end

data/app/models/page.rb

@@ -156,7 +156,7 @@ class Page < ActiveRecord::Base
   end
 
   def self.ransackable_attributes(auth_object = nil)
-    ['site_id', 'title']
+    ['site_id', 'title', 'slug']
   end
 
   def self.parent_pages(homepage_id)

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

@@ -12,6 +12,10 @@
     .drawer
       .drawer_contents#attributes
         %table.fieldset
+          - if @page_url.present?
+            = render :partial => 'url_row', :locals => {:page_url => @page_url}
+          - if @page_path.present?
+            = render :partial => 'path_row', :locals => {:page_path => @page_path}
           = render :partial => 'meta_row', :collection => @meta, :locals => {:f => fields}
           = render :partial => 'admin/page_fields/page_field', :collection => @page.fields
           = render_region :extended_metadata, :locals => {:f => fields}
@@ -29,9 +33,6 @@
         = render :partial => 'admin/page_parts/page_part', :collection => @page.parts
     = render_region :parts_bottom, :locals => {:f => fields}
 
-#previous-versions
-  = render :partial => 'admin/pages/previous_versions'
-
 .set
   - render_region :layout, :locals => {:f => fields} do |layout|
     - layout.edit_layout do

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

@@ -7,7 +7,7 @@
             = node_title
           - else
             %i.far.fa-file
-            = (link_to("#{node_title}".html_safe, edit_admin_page_path(page, site_id: page.site_id), :title => page.path)).html_safe
+            = (link_to("#{node_title}".html_safe, edit_admin_page_path(page), :title => page.path)).html_safe
             = page_type
             = spinner
     - node.status_column do

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

@@ -0,0 +1,5 @@
+%tr
+  %th.label
+    %label{ :for => "page_path" }= t('path')
+  %td.field
+    = text_field_tag "page[path]", page_path, :id => "page_path_content", :class => 'textbox', :maxlength => 200, disabled: true

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

@@ -1,28 +1,33 @@
-%fieldset
-  %h4
-    %i.fas.fa-clock-rotate-left
-    Previous Versions
-
-  - if @versions.present?
-    %section
-      %table
-        %thead
-          %tr
-            %th Date Updated
-            %th Time Updated
-            %th Updated By
-            %th Action
-        %tbody{ :id => 'versions-table' }
-          - @versions.each do |version|
-            %tr
-              %td= version[:update_date]
-              %td= version[:update_time]
-              %td= version[:updated_by]
-              %td
-                = link_to 'Restore', 
-                  restore_version_admin_page_path(@page.id, version_index: version[:index]),
-                  method: :put,
-                  data: { confirm: 'Are you sure you want to restore this version?' }
-  - else
-    %section
-      %p No previous versions are available.
+#previous-versions
+  %fieldset
+    %h4
+      %i.fas.fa-clock-rotate-left
+      Previous Versions
+    .drawer_contents#versions
+      - if @versions.present?
+        %section
+          %table
+            %thead
+              %tr
+                %th Date Updated
+                %th Time Updated
+                %th Updated By
+                %th Action
+            %tbody{ :id => 'versions-table' }
+              - @versions.each do |version|
+                %tr
+                  %td= version[:update_date]
+                  %td= version[:update_time]
+                  %td= version[:updated_by]
+                  %td
+                    = button_to 'Restore', 
+                      restore_version_admin_page_path(@page, version_index: version[:index]),
+                      method: :put,
+                      data: { confirm: 'Are you sure you want to restore this 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')}"}
+        = meta_label
+        %i.fas.fa-angle-down

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

@@ -2,7 +2,7 @@
   = hidden_field_tag :site_id, @site_id
   .page-search
     %i.fas.fa-search
-    = f.search_field :title, value: title, placeholder: 'Search by Page Title', id: 'search-input'
+    = f.search_field :query, value: @query, placeholder: 'Search by Page Title or Slug', id: 'search-input'
     %input.button{ type: 'submit', value: 'Search' }
     - if show_view_all_button
       = link_to t("view_all_pages"), admin_pages_path, class: 'button'

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

@@ -7,7 +7,7 @@
             = node_title
           - else
             %i.far.fa-file
-            = (link_to("#{node_title}".html_safe, edit_admin_page_path(page, site_id: page.site_id), :title => page.path)).html_safe
+            = (link_to("#{node_title}".html_safe, edit_admin_page_path(page), :title => page.path)).html_safe
             = page_type
             = spinner
     - node.path_column do

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

@@ -0,0 +1,5 @@
+%tr
+  %th.label
+    %label{ :for => "page_url" }= t('url')
+  %td.field
+    = text_field_tag "page[url]", page_url, :id => "page_url_content", :class => 'textbox', :maxlength => 200, disabled: true

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

@@ -6,5 +6,6 @@
   - main.edit_form do
     = form_for @page, :as => :page, :url => admin_page_path(@page), :html => {:method => :put, :multipart => true, :id => 'edit_page', 'data-onsubmit_status'=>t('saving_changes')} do |fields|
       = render :partial => 'fields', :object => fields
+    = render :partial => 'previous_versions'
   - main.edit_popups do
     = render :partial => 'popups'

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

@@ -1,8 +1,8 @@
-- @page_title = t('pages') + ' - ' + default_page_title
+- @page_title = t('search') + ' - ' + default_page_title
 
 .outset
   = render_region :top
-  = render 'search_form', title: @title, show_view_all_button: true
+  = render 'search_form', query: @query, show_view_all_button: true
   %table.index.tablesaw#pages{ :summary => t('page_hierarchy') }
     %thead
       %tr

data/config/locales/en.yml

@@ -270,6 +270,7 @@ en:
   saving_changes: Saving Changes
   saving_preferences: Saving preferences
   scheduled: "Scheduled"
+  search: 'Search'
   search_tags: 'Search Tags:'
   select:
     default: '<default>'
@@ -322,6 +323,7 @@ en:
     days: "days"
     weeks: "weeks"
     months: "months"
+  url: 'URL'
   user: 'User'
   username: 'Username'
   username_or_email: 'Username or E-mail Address'

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.19'.freeze
+  VERSION = '7.0.21'.freeze
 end

data/trusty_cms.gemspec

@@ -59,5 +59,6 @@ a general purpose content management system--not merely a blogging engine.'
   s.add_dependency 'stringex', '>= 2.7.1', '< 2.9.0'
   s.add_dependency 'tzinfo', '>= 1.2.3', '< 2.1.0'
   s.add_dependency 'uglifier', '>= 3.2', '< 5.0'
+  s.add_dependency 'uri'
   s.add_dependency 'will_paginate', '>= 3', '< 5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.19
+  version: 7.0.21
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-24 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -546,6 +546,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: uri
+  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: will_paginate
   requirement: !ruby/object:Gem::Requirement
@@ -728,6 +742,7 @@ files:
 - app/assets/stylesheets/admin/partials/_messages.scss
 - 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/_sidebar.scss
 - app/assets/stylesheets/admin/partials/_tabcontrol.scss
 - app/assets/stylesheets/admin/partials/_table.scss
@@ -765,6 +780,7 @@ files:
 - app/helpers/admin/references_helper.rb
 - app/helpers/admin/regions_helper.rb
 - app/helpers/admin/resource_helper.rb
+- app/helpers/admin/url_helper.rb
 - app/helpers/admin/users_helper.rb
 - app/helpers/admin/welcome_helper.rb
 - app/helpers/application_helper.rb
@@ -831,10 +847,12 @@ files:
 - app/views/admin/pages/_fields.html.haml
 - app/views/admin/pages/_meta_row.html.haml
 - app/views/admin/pages/_node.html.haml
+- app/views/admin/pages/_path_row.haml
 - app/views/admin/pages/_popups.html.haml
 - app/views/admin/pages/_previous_versions.haml
 - app/views/admin/pages/_search_form.html.haml
 - app/views/admin/pages/_search_result_node.html.haml
+- app/views/admin/pages/_url_row.haml
 - app/views/admin/pages/children.html.haml
 - app/views/admin/pages/edit.html.haml
 - app/views/admin/pages/index.html.haml