effective_pages 3.0.6 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cf23b05e739f425ac9681d3a23482c0080498a59257e3e7f1988976e2807d3e
-  data.tar.gz: 4504a432b1d2e2700aa351160ba73afe2ae9368f59aed98e00a5d0b3b30cb677
+  metadata.gz: 7451b8d10bc65dccbcc9d6927b5c76eaa917378b6725fd887e3509a7d39369fe
+  data.tar.gz: e0a7a32e358dd7009ba7f4801dd163422b67b653eb62037a06a6f97c4dcebe43
 SHA512:
-  metadata.gz: 7ee1f64e3076dc7ca7e428d8d310881836b6ce24feeea8c310a20b7e1b582f60cb2a57992cb25f2d73ee8621f8424237b0cddc8e5c6292a10bb4041f1f005824
-  data.tar.gz: 36137529002c0d6051ded641ee237a1e7419eb5a62364ab32718d30d7308dc5aa29d3b9a44746b07556cb99440fda95efe61b9b8fefa5875c2bb00cc0a706d4b
+  metadata.gz: ca28a3a998012976cfcef1773eac6f9d673ec22bcece7ab74fa2fd4812a9720de9b6648e05e1af1906d5ca80454910a0c0fb08d0e586cc2d606a748919887078
+  data.tar.gz: '0249e9d861efc9922fd998ce55685714e1f2890658b3b431a96d9c209a8133e19ccb6e4fddfc63d6f8d9da7c9f8bacc6fbf933aed2f51a65b08248c9399b247c'

data/app/models/effective/page.rb

@@ -59,8 +59,7 @@ module Effective
     validates :layout, presence: true
     validates :template, presence: true
 
-    validates :menu_name, if: -> { menu? && EffectivePages.menus.present? },
-      presence: true, inclusion: { in: EffectivePages.menus.map(&:to_s) }
+    validates :menu_name, if: -> { menu? && EffectivePages.menus.present? }, presence: true
 
     # validates :menu_position, if: -> { menu? },
     #   presence: true, uniqueness: { scope: [:menu_name, :menu_parent_id] }

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

@@ -4,7 +4,7 @@
 - Effective::Page.for_menu_root(menu).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.include?(page.roles)
+  - next if page.roles.present? && (current_user.roles & page.roles).blank?
 
   - menu_children = page.menu_children.select { |page| page.menu_name == menu }
 
@@ -15,6 +15,6 @@
       - menu_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.include?(page.roles)
+        - next if page.roles.present? && (current_user.roles & page.roles).blank?
 
         = nav_link_to((page.menu_title.presence || page.title), (page.menu_url.presence || effective_pages.page_path(page)))

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 EffectivePages::Engine.routes.draw do
   namespace :admin do
     resources :pages, except: [:show]

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.0.6'.freeze
+  VERSION = '3.0.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.9
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2022-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails