effective_pages 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2607792f3255903a84c8ef0b74d49d9278265a5ad0bdd518aae75efe55aeee7
-  data.tar.gz: b5e0ce5b60989700346dffa5709693c9fe80ed12a49f93f2feaa488623d38f24
+  metadata.gz: 6cf23b05e739f425ac9681d3a23482c0080498a59257e3e7f1988976e2807d3e
+  data.tar.gz: 4504a432b1d2e2700aa351160ba73afe2ae9368f59aed98e00a5d0b3b30cb677
 SHA512:
-  metadata.gz: 4f0b5af9258a98e3cd3af75523b5670716ea37a6c78d37b8951071602489ccbeee773605ee025ccf08aca905c21e139581349fe4c822f900d788493e69eb6e4e
-  data.tar.gz: 2f5ece4423c3742e50e104779d9a58ef8ca4a69870e8bec5a9851538c680615acba337a85be9d286c4f967341d223f2e71d7fcaa6cb7954058b03aadb04ccfb6
+  metadata.gz: 7ee1f64e3076dc7ca7e428d8d310881836b6ce24feeea8c310a20b7e1b582f60cb2a57992cb25f2d73ee8621f8424237b0cddc8e5c6292a10bb4041f1f005824
+  data.tar.gz: 36137529002c0d6051ded641ee237a1e7419eb5a62364ab32718d30d7308dc5aa29d3b9a44746b07556cb99440fda95efe61b9b8fefa5875c2bb00cc0a706d4b

data/app/models/effective/page.rb

@@ -84,6 +84,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
@@ -107,7 +116,7 @@ module Effective
     end
 
     def menu_root_level
-      menu_parent.blank?
+      menu? && menu_parent.blank?
     end
 
   end

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

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

data/lib/effective_pages/version.rb

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

data/lib/effective_pages.rb

@@ -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/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.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-20 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails