effective_pages 3.3.0 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2620fbfec6b912fd31b7d9821fe5ef73eecbfb4c509063883f8c144a2aa66d30
-  data.tar.gz: d75935c05702f1328e32058f45874999a3b3b3f7f7becab1202c4d18b9dee743
+  metadata.gz: e3ef36f0fae90cb4172cbc5541abbac53d632e611024fc1b3febd6fc8476cafd
+  data.tar.gz: ed784ec8c9575641c5803450d5664b5d11cf90aab89d73163c4d86e28448f66e
 SHA512:
-  metadata.gz: 9dd4484e144bbbb2287dc399eb93bbae86b423c05fea8ca0bd0f7d5f716e384ebc1d935eef964166517b6358d1565f539c32894d6a2992e851a3e2d9104a6192
-  data.tar.gz: f1fa33f1bd839164cb281f23a3439f4d624458120061d7aeb7a0c2e16703d7b46d7043ae4abaf4878cea8bbf65e5a8a0710a02c00fbe0c8185f9df28e1e3e46c
+  metadata.gz: 6afc63a6a120d7b67d872ab985f990d0db4117b12a7e0ae1bf79a2451c00fdcf89e18e8c2a3c58d22344f3a0190e0fc9cf11589b11c01e57f8fbf7798fee12cb
+  data.tar.gz: 38786d89a2341773f87bb122d9b64f26e7778d23c97dee10ee04d1b846b09331e9266acc7b156e6e8bd62dd249d58af64d465454d564d8cca958688ca8ca753c

data/app/datatables/effective_pages_menu_datatable.rb

@@ -18,10 +18,10 @@ class EffectivePagesMenuDatatable < Effective::Datatable
     col :menu_children, label: 'Children' do |page|
       page.menu_children.group_by(&:menu_group).values.flatten.map do |child|
         content_tag(:div, class: 'col-resource_item') do
-          link = link_to(child.admin_menu_label, effective_pages.edit_admin_page_path(child))
+          link = link_to(child.menu_to_s, effective_pages.edit_admin_page_path(child))
 
           list = child.menu_children.group_by(&:menu_group).values.flatten.map do |child|
-            content_tag(:li, link_to(child.admin_menu_label, effective_pages.edit_admin_page_path(child)))
+            content_tag(:li, link_to(child.menu_to_s, effective_pages.edit_admin_page_path(child)))
           end
 
           link + (content_tag(:ul, list.join.html_safe) if list.present?).to_s

data/app/helpers/effective_menus_helper.rb

@@ -28,8 +28,10 @@ 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
+
           url = (page.menu_url.presence || effective_pages.page_path(page))
-          content_tag(:li, link_to(page, (page.menu_root_with_children? ? '#' : url), title: page.title), class: 'breadcrumb-item')
+          content_tag(:li, link_to(page, url, title: page.title), class: 'breadcrumb-item')
         end +
         [content_tag(:li, page, class: 'breadcrumb-item active', 'aria-current': 'page')]
       ).join.html_safe

data/app/models/effective/page_section.rb

@@ -6,7 +6,7 @@ module Effective
     belongs_to :owner, polymorphic: true, optional: true
 
     has_many_rich_texts
-    has_many_attached :files
+    has_one_attached :file
 
     log_changes if respond_to?(:log_changes)
 
@@ -32,7 +32,7 @@ module Effective
     validates :link_url, presence: true, if: -> { link_label.present? }
     validates :link_url, absence: true, if: -> { link_label.blank? }
 
-    scope :deep, -> { with_attached_files.includes(:rich_texts) }
+    scope :deep, -> { with_attached_file.includes(:rich_texts) }
     scope :sorted, -> { order(:name) }
 
     def to_s

data/app/views/admin/page_sections/_form_page_section.html.haml

@@ -18,7 +18,7 @@
     .col= f.text_field :link_label
     .col= f.url_field :link_url
 
-  = f.file_field :files, label: 'Attachment'
+  = f.file_field :file, label: 'Attachment'
 
   = f.text_field :caption
 

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

@@ -1,17 +1,18 @@
 - raise('expected a page') unless page.present?
 
-- menu_children = page.menu_children
+- children = page.menu_children
 
-- if menu_children.blank? && page.menu_parent&.menu_children.present?
-  - menu_children = page.menu_parent&.menu_children
+- if page.menu_children.present?
+  = nav_link_to(page.menu_to_s, (page.menu_url.presence || effective_pages.page_path(page)))
 
-- menu_children.group_by(&:menu_group).each do |menu_group, pages|
-  - if menu_group.present?
-    %h6= menu_group
+- # 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)))
 
-  - pages.each do |page|
-    - next unless EffectiveResources.authorized?(self, :show, page)
-    - next if (page.authenticate_user || page.roles.present?) && current_user.blank?
-    - next if page.roles.present? && (current_user.roles & page.roles).blank?
+- children.each do |page|
+  - next unless EffectiveResources.authorized?(self, :show, page)
+  - next if (page.authenticate_user || page.roles.present?) && current_user.blank?
+  - next if page.roles.present? && (current_user.roles & page.roles).blank?
 
-    = nav_link_to(page.menu_to_s, (page.menu_url.presence || effective_pages.page_path(page)))
+  = nav_link_to(page.menu_to_s, (page.menu_url.presence || effective_pages.page_path(page)))

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.3.0'.freeze
+  VERSION = '3.3.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails