effective_pages 3.0.7 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edab6d11ae76db81b7c9805116c36cf24562346eff5cfab83df02f270a1e33cb
-  data.tar.gz: d72f504d2563ab8e78e92dad9e7d85032c45b5694a5b23b77e8c77a17f24e98c
+  metadata.gz: ce5bc87bbf145bfcf88dfcf9b5efb9ab778876b4d103cc0a2b2cabfbae9f0f05
+  data.tar.gz: 613c1b974148fd8f0b31bcd204ce5cbd979545baf09d08468f9bb44f21ee4ab5
 SHA512:
-  metadata.gz: c88a81eb833e0127f2001e5056a4da27e17206d9396fac46a513357b7d51894d5a308e5092e34ba69b7bab51c56ee5b8e5528fb80fe286c9939b2cb3969b3cdf
-  data.tar.gz: a2042ed232554fa71b4dd7135ba5d14647105b33c634a736a2ed4059927825c607e9b084858a6785cd32a159a76323f9648410703999d7b16c08e537501e0207
+  metadata.gz: 51e0ba41ee3f97be0fe574b4cd017ba47fe3421e0d7827c0d1fad8522f4d1194ff8dc4e7c721c06d4d0b84b8414ba31a201ccea0ced2ae5dbc43148f1512b216
+  data.tar.gz: 7ff18a08e8d591bc473609244604b73bd8f24a42cccf579492db53d24fb536b7e6c460f36718ea35fa59693ba9aa437fab6806c02e6729565a4330d1cbaf4e42

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/engine.rb

@@ -4,9 +4,11 @@ module EffectivePages
 
     # Include Helpers to base application
     initializer 'effective_pages.action_controller' do |app|
-      ActiveSupport.on_load :action_controller_base do
-        helper EffectivePagesHelper
-        helper EffectiveMenusHelper
+      app.config.to_prepare do
+        ActiveSupport.on_load :action_controller_base do
+          helper EffectivePagesHelper
+          helper EffectiveMenusHelper
+        end
       end
     end
 

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.0.7'.freeze
+  VERSION = '3.0.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-28 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails