effective_pages 3.4.12 → 3.4.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec9b9faa01d5d460d0064fd18152e8b6c06ce910f86fe5a5384c39aebcfbc212
-  data.tar.gz: e5fe292060f189cf864eee702a305e513f28c596cbbbc7ac01a5b302cc0fe40c
+  metadata.gz: 370a0872726ab5cc18dca40bf8bdafaef20ac8cfc145600fa1679abe2253059f
+  data.tar.gz: e9e3de8d9fd1e68ee1421a96cf6a0fb15af8014421edf95493e2146d067e8f26
 SHA512:
-  metadata.gz: ae3a89c63ba34122f61061a4695e8b24ffb173a8637adf457dd12f5a50cb343724733d0d28e44fe14458877daa79791210153739334ed8bf1d3ca177cdfc0962
-  data.tar.gz: a28500dcfabd62b961894c57d523b7df6420ee51ab89558c9b7d097346b0ffb86bd49eb8c0c62e008510380ae2fa90561c1f197fdd487f40dac067254cec8c96
+  metadata.gz: 16f78050a37aa5785fea91281c439dd6ad275377374969569f4e5d9b34b8b287b9d930494eb91b7481f6ac29a57a42e52ea8ededfeb5775928c7e1b32188c034
+  data.tar.gz: cbea464d3c44f65a05b0d20bad91ea2e18d12c40968885f09fcfa9f4d80605148dfee04c3cb3e0364e72b4328de82a332a4f1f1add499278568d9d1ba749edc6

data/app/datatables/effective_pages_menu_datatable.rb

@@ -16,11 +16,11 @@ class EffectivePagesMenuDatatable < Effective::Datatable
 
     # We only support depth 2 and 3.
     col :menu_children, label: 'Children' do |page|
-      page.menu_children.group_by(&:menu_group).values.flatten.map do |child|
+      page.menu_children.group_by { |child| child.menu_group.presence }.values.flatten.map do |child|
         content_tag(:div, class: 'col-resource_item') do
           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|
+          list = child.menu_children.group_by { |child| child.menu_group.presence }.values.flatten.map do |child|
             content_tag(:li, link_to(child.menu_to_s, effective_pages.edit_admin_page_path(child)))
           end
 

data/app/models/effective/page.rb

@@ -143,10 +143,6 @@ module Effective
       duplicate.tap { |page| page.save! }
     end
 
-    def menu_group
-      (menu_group ||= '')
-    end
-
     # When true, this should not appear in sitemap.xml and should return 404 if visited
     def menu_root_with_children?
       menu_root? && menu_parent?

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

@@ -14,8 +14,8 @@
 
   - if menu_children.present?
     = nav_dropdown(page.menu_to_s, groups: true) do
-      - menu_children.group_by(&:menu_group).each do |menu_group, pages|
-        = nav_dropdown_group(menu_group) do
+      - menu_children.group_by { |menu| menu.menu_group.presence }.each do |menu_group, pages|
+        = nav_dropdown_group(menu_group || '') do
           - pages.each do |page|
             - next unless EffectiveResources.authorized?(self, :show, page)
             - next if (page.authenticate_user || page.roles.present?) && current_user.blank?

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.4.12'.freeze
+  VERSION = '3.4.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.4.12
+  version: 3.4.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-24 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails