trusty-cms 7.0.26 → 7.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d45d76c458d982e12e398501691b9c80786772ae9a752b2476bcababf4f97ceb
-  data.tar.gz: c5ff04b23662c3df08191e9780008c1f28b7eaffcb6f54a912dda3521f2bf22e
+  metadata.gz: 94e21fe3c5c8a96301637f07c7a3520590884187a45d9e1f00aa39e81e129f5c
+  data.tar.gz: 769b855942bd1bb7ecdf193c062e47f45d77fe0561acc9b0b368f5a934e56408
 SHA512:
-  metadata.gz: 9b73ce6f51a809957d30ca3a51a67f2496db293b1160438608029d3a6e3ec40ea6aea40adad0d60374212a3475a508e900505b957890c486e505d47b15a3a69c
-  data.tar.gz: 0b72e9b00f8dd0b2b5964f4d00f6d6cc085052a7c0e9635f48a6aee8325460d2890449b0a65200b490087c4b3d82c589d63987e987954c9e5278f92a4e315134
+  metadata.gz: ec4b76f1b3009d3eb40fa9cd66f033967f9a3ebdeb022ccfbf04d60e88c11dfe7ee2a4dac88a879ecd57170903dd0de2705c8fb5ab50bb2426a34daf23065e37
+  data.tar.gz: 403fc527a1bf912a6498efc113082b360556df0fec15148f4cfeb7efdd213b62b04fa935d60f65f57134297f4685a2da0a1895c0957bb0b6a7719f1384635070

data/Gemfile.lock

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

data/app/controllers/admin/pages_controller.rb

@@ -3,7 +3,6 @@ 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
 

data/app/helpers/admin/node_helper.rb

@@ -1,4 +1,6 @@
 module Admin::NodeHelper
+  include Admin::UrlHelper
+
   def render_nodes(page, starting_index, parent_index = nil, simple = false)
     @rendered_html = ''
     render_node page, starting_index, parent_index, simple
@@ -25,17 +27,6 @@ module Admin::NodeHelper
     page
   end
 
-  def format_path(path)
-    return '' if path.nil? || path.empty?
-
-    parts = path.split('/').reject(&:empty?)
-    return 'Root' if parts.size == 1
-    return '/' if parts.size == 2
-
-    formatted_path = parts[1..-2].join('/')
-    formatted_path.empty? ? '/' : "/#{formatted_path}"
-  end
-
   def homepage
     @homepage ||= Page.find_by_parent_id(nil)
   end

data/app/helpers/admin/url_helper.rb

@@ -1,6 +1,18 @@
 module Admin::UrlHelper
   require 'uri'
 
+  def format_path(path)
+    return '' if path.to_s.empty?
+
+    parts = path.split('/').reject(&:empty?)
+    parts_size = parts.size
+    return 'Root' if parts_size == 1
+    return '/' if parts_size == 2
+
+    formatted_path = parts[1..-2].join('/')
+    formatted_path.empty? ? '/' : "/#{formatted_path}"
+  end
+
   def generate_page_url(url, page)
     base_url = extract_base_url(url)
     build_url(base_url, page)

data/app/models/page.rb

@@ -121,7 +121,7 @@ class Page < ActiveRecord::Base
   def path
     return '' if slug.blank?
 
-    parent? ? parent.child_path(self) : clean_path(slug)
+    parent.present? ? clean_path("#{parent.path}/#{slug}") : clean_path(slug)
   end
 
   alias_method :url, :path

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.26'.freeze
+  VERSION = '7.0.27'.freeze
 end

metadata

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