trusty-cms 7.0.9 → 7.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90afffae83c31538f9db86d664a6cf86d4a29b1e910a7bd9644d795949908a8a
-  data.tar.gz: 2ed58dea81ef5468bf67ccbac8af93e0fee4918a4937cce840ef39846306e886
+  metadata.gz: 449fe5133cb47597ee1a6088a2104532570912d8741e5d6b59b486b4ed74a470
+  data.tar.gz: 41500d82c661b36dd039d5157029f25a1695b85b5aff10f57a92e8931bdb0be5
 SHA512:
-  metadata.gz: 9c7197a1dde572a4b5280165ea6fcfa13be02c3830ff4bd3e5b0038d1ea4ddede69739b76f9373d575517b85fc3925022e357e0aa7efc3678de50aa5ed17faf3
-  data.tar.gz: 99658f3bbb7c65c3fdb2e02ddbc2eab6f6cf02b757a332211b81a154eb45e0080c3b61d93d07497d38e4d0f2daa5b74425434cf18875b4ab69358a20d70ffa92
+  metadata.gz: cd847aa08fbda487d3ef6e216858ac4f643e15291ed52e03c4f4a2a545a48459e2ef55a289b3773b7b416cfac6fd97940a80857514888952e095ccf3d8100849
+  data.tar.gz: e383a81c109eff12e51d99d09b9afb1a28af22fd5d6bc78741921ccba4257e4d70643b6361c2b7c7ead11e717bd1529b8cef04d0ff5c80f21650a49089c07758

data/Gemfile.lock

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

data/app/controllers/admin/pages_controller.rb

@@ -3,6 +3,7 @@ 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::PagesHelper
 
   class PreviewStop < ActiveRecord::Rollback
     def message
@@ -113,13 +114,13 @@ class Admin::PagesController < Admin::ResourceController
     versions
       .sort_by(&:created_at).reverse
       .map do |version|
-        {
-          index: version&.index,
-          update_date: version&.created_at&.strftime('%B %d, %Y'),
-          update_time: version&.created_at&.strftime('%I:%M %p'),
-          updated_by: User.unscoped.find_by(id: version&.whodunnit)&.name || 'Unknown User',
-        }
-      end
+      {
+        index: version&.index,
+        update_date: version&.created_at&.strftime('%B %d, %Y'),
+        update_time: version&.created_at&.strftime('%I:%M %p'),
+        updated_by: User.unscoped.find_by(id: version&.whodunnit)&.name || 'Unknown User',
+      }
+    end
   end
 
   def restore_page_version(page, index)

data/app/controllers/page_status_controller.rb

@@ -32,7 +32,8 @@ class PageStatusController < ApplicationController
 
     pages.each do |page|
       page_id = page.id
-      if page.published_at <= Time.now
+      published_at = page.published_at
+      if published_at && published_at <= Time.now
         page.update(status_id: Status[:published].id)
         updated_pages << page_id
       else

data/app/helpers/admin/pages_helper.rb

@@ -17,4 +17,10 @@ module Admin::PagesHelper
   def clean_page_description(page)
     page.description.to_s.strip.gsub(/\t/, '').gsub(/\s+/, ' ')
   end
+
+  def parent_page_options(current_site, page)
+    parent_pages = Page.parent_pages(current_site.homepage_id)
+    selected_page_id = page.id.presence_in(parent_pages.pluck(:id)) || page.parent_id.presence_in(parent_pages.pluck(:id))
+    options_for_select(parent_pages.map { |p| [p.title, p.id] }, selected_page_id)
+  end
 end

data/app/models/page.rb

@@ -159,6 +159,10 @@ class Page < ActiveRecord::Base
     ['site_id', 'title']
   end
 
+  def self.parent_pages(homepage_id)
+    where(parent_id: homepage_id).or(where(id: homepage_id))
+  end
+
   private :set_response_headers
 
   def set_content_type(response)

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

@@ -1,7 +1,6 @@
 = fields.hidden_field :lock_version
 = fields.hidden_field :parent_id
 = fields.hidden_field :class_name
-
 = render_region :form_top, :locals => {:f => fields}
 
 - render_region :form, :locals => {:f => fields} do |form|
@@ -43,6 +42,10 @@
       .page-type
         = fields.label :class_name, t('page_type')
         = fields.select :class_name, [[t('select.normal'), '']] + Page.descendants.map { |p| [p.display_name, p.name] }.sort_by { |p| p.first }
+    - layout.edit_parent do
+      .parent-page
+        = fields.label :parent_id, t('parent_page')
+        = fields.select :parent_id, parent_page_options(current_site, @page)
     - layout.edit_status do
       - if current_user.admin? || current_user.editor?
         .status
@@ -56,6 +59,7 @@
             class: 'datetime',
             type: 'datetime-local',
             value: (@page.published_at? ? @page.published_at.strftime('%Y-%m-%dT%H:%M') : nil)
+
     = render_region :layout_row, :locals => {:f => fields}
 
 .error.hidden

data/config/locales/en.yml

@@ -231,6 +231,7 @@ en:
     removed_many: "The pages were successfully removed from the site."
     removed_one: "The page was successfully removed from the site."
     saved: "Your page has been saved below."
+  parent_page: 'Parent Page'
   password: 'Password'
   password_confirmation: 'Confirm New Password'
   personal: 'Personal'

data/lib/trusty_cms/admin_ui.rb

@@ -170,7 +170,7 @@ module TrustyCms
         page.edit = RegionSet.new do |edit|
           edit.main.concat %w{edit_header edit_form edit_popups}
           edit.form.concat %w{edit_title edit_extended_metadata edit_page_parts}
-          edit.layout.concat %w{edit_layout edit_type edit_status edit_published_at}
+          edit.layout.concat %w{edit_layout edit_type edit_parent edit_status edit_published_at}
           edit.form_bottom.concat %w{edit_buttons edit_timestamp}
         end
         page.index = RegionSet.new do |index|

data/lib/trusty_cms/version.rb

@@ -1,4 +1,4 @@
 module TrustyCms
-  VERSION = '7.0.9'.freeze
+  VERSION = '7.0.11'.freeze
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 7.0.9
+  version: 7.0.11
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-16 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator