effective_pages 3.8.3 → 3.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93461d891693d48f4a9610dc33406c38620c9b8470ef64cd0953e7c31f45ef7c
-  data.tar.gz: 9f0ae01994f41320788d6b183be99860d23a4103cdff78a8314fcf610e65b28a
+  metadata.gz: ab2014d3e00b7e610f9e4bbb783dc853d5eeb5a5c51215266d37c42d6435d453
+  data.tar.gz: 59c5957db1af495169511e34bd2b77b9da60574d16d8fabcde374738429c55eb
 SHA512:
-  metadata.gz: c10f7ec96802a69effc73b984362c5147aeb1cc2f96e5a871b059542938b91de525f5cb42f06c0e58828b5eac966362f21ca8f0da0ff9dcc37b224cb05f44805
-  data.tar.gz: 47527c78afcf1dc278acf6ddd87db09bf319f6e7d36128fbe586e2c67d822316813b13d37377806d3cf8a78bf856b49ef7aa5016fd004d7dc6c2004f640ff2d2
+  metadata.gz: 71d6ef9905b0426c44b791e6422b6784e395bd776d3a346fee1609931769b5e9e2f2b5f63b5240e643d763394d6624ebf8089f5d59bb45d7f25f85071a1c74a7
+  data.tar.gz: 8d07252b5ba59072c8f078f394260da1ab6bd5b874f1ec9543f247c66528760b729a22c7cab542b66dbee7a402f64db929fc08ebf5baebfbe15deb1caa8f2eaa

data/app/controllers/effective/pages_controller.rb

@@ -3,7 +3,7 @@ module Effective
     include Effective::CrudController
 
     def show
-      @pages = Effective::Page.all
+      @pages = Effective::Page.deep.all
       @pages = @pages.published unless EffectiveResources.authorized?(self, :admin, :effective_pages)
 
       @page = @pages.find(params[:id])

data/app/helpers/effective_menus_helper.rb

@@ -28,7 +28,9 @@ module EffectiveMenusHelper
       (
         [content_tag(:li, link_to(root, root_path, title: root), class: 'breadcrumb-item')] +
         parents.map do |page|
-          next if page.menu_root_with_children? # Don't show root pages becaues they have no content
+          page.try(:strict_loading!, false)
+
+          next if page.menu_root_with_children? # Don't show root pages because they have no content
 
           url = (page.menu_url.presence || effective_pages.page_path(page))
           content_tag(:li, link_to(page, url, title: page.title), class: 'breadcrumb-item')
@@ -60,7 +62,7 @@ module EffectiveMenusHelper
   def admin_menu_parent_collection(page = nil)
     raise('expected a page') if page.present? && !page.kind_of?(Effective::Page)
 
-    pages = Effective::Page.menuable.root_level.where.not(id: page)
+    pages = Effective::Page.deep.menuable.root_level.where.not(id: page)
 
     if EffectivePages.max_menu_depth == 2
       # You can only select root level pages

data/app/helpers/effective_page_banners_helper.rb

@@ -8,9 +8,9 @@ module EffectivePageBannersHelper
     return unless page.banner? || EffectivePages.banners_force_randomize
 
     # Always return a random banner if config.banners_force_randomize
-    page_banner = Effective::PageBanner.random.first if EffectivePages.banners_force_randomize
+    page_banner = Effective::PageBanner.deep.random.first if EffectivePages.banners_force_randomize
     page_banner ||= page.page_banner if page.banner? && page.page_banner.present?
-    page_banner ||= Effective::PageBanner.random.first if page.banner? && page.banner_random?
+    page_banner ||= Effective::PageBanner.deep.random.first if page.banner? && page.banner_random?
 
     return if page_banner.blank?
 

data/app/models/effective/page.rb

@@ -58,7 +58,11 @@ module Effective
       timestamps
     end
 
-    scope :deep, -> { includes(:page_banner, :menu_parent, menu_children: :menu_parent) }
+    scope :deep, -> { 
+      base = includes(:page_banner, :tags, :rich_texts, :menu_parent, menu_children: [:menu_parent, :menu_children]) 
+      base = base.includes(:pg_search_document) if defined?(PgSearch)
+      base
+    }
 
     scope :draft, -> { where(draft: true) }
     scope :published, -> { where(draft: false) }

data/app/models/effective/permalink.rb

@@ -16,7 +16,11 @@ module Effective
 
     log_changes if respond_to?(:log_changes)
 
-    scope :deep, -> { with_attached_attachment }
+    scope :deep, -> { 
+      base = with_attached_attachment
+      base = base.includes(:pg_search_document) if defined?(PgSearch)
+      base
+    }
 
     effective_resource do
       title        :string

data/app/views/effective/pages/_page_menu.html.haml

@@ -6,9 +6,12 @@
   = nav_link_to(page.menu_to_s, (page.menu_url.presence || effective_pages.page_path(page)))
 
 - # if this is a third depth page, show the parent and siblings
-- if !page.menu_children.present? && page.menu_parent.present? && page.menu_parent&.menu_children&.present? && page.menu_parent&.menu_parent.present?
-  - children = page.menu_parent.menu_children
-  = nav_link_to(page.menu_parent.menu_to_s, (page.menu_parent.menu_url.presence || effective_pages.page_path(page.menu_parent)))
+- if page.menu_children.blank? && page.menu_parent.try(:menu_parent_id).present?
+  - page.menu_parent.try(:strict_loading!, false)
+
+  - if page.menu_parent.menu_children.present?
+    - children = page.menu_parent.menu_children
+    = nav_link_to(page.menu_parent.menu_to_s, (page.menu_parent.menu_url.presence || effective_pages.page_path(page.menu_parent)))
 
 - children.each do |page|
   - next unless EffectiveResources.authorized?(self, :show, page)

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.8.3'.freeze
+  VERSION = '3.8.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.8.3
+  version: 3.8.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-28 00:00:00.000000000 Z
+date: 2023-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails