effective_pages 3.0.3 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6b7d0d5523e2ff95f473af071206ced883ffd26b1ecf55f0ada3d1976cf8826
-  data.tar.gz: be7222499f8473aa65af8c7f10e6c9e2a57f729cb59f677717cc4287f1a4d5c1
+  metadata.gz: edab6d11ae76db81b7c9805116c36cf24562346eff5cfab83df02f270a1e33cb
+  data.tar.gz: d72f504d2563ab8e78e92dad9e7d85032c45b5694a5b23b77e8c77a17f24e98c
 SHA512:
-  metadata.gz: 970193c5f49a070d5006c5b5ecc41d48772481c65a2a9c5397f5562f6a46e4fd5bea087e5637834dfa83c480ee08fa253fede6f9d24f13a3f69bc4a2efe97b35
-  data.tar.gz: 7c4ce2f0896399ce6aaf8f69dcf1632565bd59fc80e0c155d4d5133955801f642b0e7e1268c9bdfca71c4e0da0ae70dfbb0a239f46ce9825f0057590d62461b9
+  metadata.gz: c88a81eb833e0127f2001e5056a4da27e17206d9396fac46a513357b7d51894d5a308e5092e34ba69b7bab51c56ee5b8e5528fb80fe286c9939b2cb3969b3cdf
+  data.tar.gz: a2042ed232554fa71b4dd7135ba5d14647105b33c634a736a2ed4059927825c607e9b084858a6785cd32a159a76323f9648410703999d7b16c08e537501e0207

data/app/models/effective/page.rb

@@ -1,6 +1,7 @@
 module Effective
   class Page < ActiveRecord::Base
     attr_accessor :current_user
+    attr_accessor :menu_root_level
 
     # These parent / children are for the menu as well
     belongs_to :menu_parent, class_name: 'Effective::Page', optional: true
@@ -58,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] }
@@ -83,6 +83,15 @@ module Effective
       title
     end
 
+    # As per has_many_rich_texts
+    def body
+      rich_text_body
+    end
+
+    def sidebar
+      rich_text_sidebar
+    end
+
     def published?
       !draft?
     end
@@ -105,6 +114,10 @@ module Effective
       duplicate.tap { |page| page.save! }
     end
 
+    def menu_root_level
+      menu? && menu_parent.blank?
+    end
+
   end
 
 end

data/app/views/admin/pages/_form.html.haml

@@ -14,11 +14,13 @@
       = render '/admin/pages/form_page', page: page
 
     - if page.persisted?
-      = tab 'Content' do
-        = render '/admin/pages/form_content', page: page
+      - if EffectivePages.menus.present?
+        = tab 'Menu' do
+          = render '/admin/pages/form_menu', page: page
 
-      = tab 'Menu' do
-        = render '/admin/pages/form_menu', page: page
+      - unless page.menu_root_level
+        = tab 'Content' do
+          = render '/admin/pages/form_content', page: page
 
       = tab 'Access' do
         = render '/admin/pages/form_access', page: page

data/app/views/admin/pages/_form_menu.html.haml

@@ -8,11 +8,17 @@
     - else
       = f.hidden_field :menu_name, value: menus.first
 
+    = f.check_box :menu_root_level, label: "This is a top level menu item. Do not show page content."
+
+    = f.show_if :menu_root_level, true do
+      = f.hidden_field :menu_parent_id, value: nil
+
+    = f.show_if :menu_root_level, false do
+      = f.select :menu_parent_id, Effective::Page.menuable.root_level.where.not(id: f.object), required: true
+
     = f.text_field :menu_title, hint: "Display this title on menus instead of full page title"
 
     = f.text_field :menu_url, label: "Redirect to path or url instead of displaying page",
       hint: "Must start with http(s):// or /"
 
-    = f.select :menu_parent_id, Effective::Page.menuable.root_level, placeholder: 'None. Top level menu.'
-
   = f.submit

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

@@ -12,7 +12,7 @@
     = nav_link_to((page.menu_title.presence || page.title), (page.menu_url.presence || effective_pages.page_path(page)))
   - else
     = nav_dropdown(page.to_s) do
-      - ([page] + menu_children).each do |page|
+      - 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)

data/lib/effective_pages/version.rb

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

data/lib/effective_pages.rb

@@ -1,6 +1,6 @@
-require 'effective_datatables'
-require 'effective_resources'
 require 'effective_roles'
+require 'effective_resources'
+require 'effective_datatables'
 require 'effective_pages/engine'
 require 'effective_pages/version'
 
@@ -19,7 +19,9 @@ module EffectivePages
   include EffectiveGem
 
   def self.templates
-    ApplicationController.view_paths.map { |path| Dir[File.join(path, pages_path, '**')] }.flatten.map do |file|
+    view_paths = defined?(Tenant) ? Tenant.view_paths : ApplicationController.view_paths
+
+    view_paths.map { |path| Dir[File.join(path, pages_path, '**')] }.flatten.map do |file|
       name = File.basename(file).split('.').first
       next if name.starts_with?('_')
       next if Array(EffectivePages.excluded_pages).map { |str| str.to_s }.include?(name)
@@ -30,7 +32,9 @@ module EffectivePages
   def self.layouts
     return [] if layouts_path.blank?
 
-    ApplicationController.view_paths.map { |path| Dir[File.join(path, layouts_path, '**')] }.flatten.map do |file|
+    view_paths = defined?(Tenant) ? Tenant.view_paths : ApplicationController.view_paths
+
+    view_paths.map { |path| Dir[File.join(path, layouts_path, '**')] }.flatten.map do |file|
       name = File.basename(file).split('.').first
       next if name.starts_with?('_')
       next if name.include?('mailer')

data/lib/generators/effective_pages/install_generator.rb

@@ -21,9 +21,6 @@ module EffectivePages
 
       def create_migration_file
         @pages_table_name = ':' + EffectivePages.pages_table_name.to_s
-        @menus_table_name = ':' + EffectivePages.menus_table_name.to_s
-        @menu_items_table_name = ':' + EffectivePages.menu_items_table_name.to_s
-
         migration_template ('../' * 3) + 'db/migrate/01_create_effective_pages.rb.erb', 'db/migrate/create_effective_pages.rb'
       end
 

data/lib/tasks/effective_pages_tasks.rake

@@ -1,29 +1,3 @@
 # bundle exec rake effective_pages:seed
 namespace :effective_pages do
-  task seed: :environment do
-    include EffectiveMenusHelper
-
-    return true if Effective::Menu.find_by_title('main menu').present?
-
-    Effective::Menu.new(:title => 'main menu').build do
-      dropdown 'About' do
-        item '111'
-        item '222'
-        dropdown 'More...' do
-          item '333'
-          item '444'
-        end
-      end
-
-      dropdown 'Pages' do
-        item 'AAA'
-        divider
-        item 'BBB'
-        item 'CCC'
-        divider
-        item 'DDD'
-      end
-    end.save!
-
-  end
 end

metadata

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