effective_pages 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3294060a1540c8cbd64e0ddf2e7cdde0b5f82d541e6a14e87624ca03341f9325
-  data.tar.gz: d4a3f858cf1041f4f8d4dc2365a2a09f4ca5d563bb2ddad06df0e95506db7194
+  metadata.gz: e2607792f3255903a84c8ef0b74d49d9278265a5ad0bdd518aae75efe55aeee7
+  data.tar.gz: b5e0ce5b60989700346dffa5709693c9fe80ed12a49f93f2feaa488623d38f24
 SHA512:
-  metadata.gz: b4ce35d731fb1941f708d4e99971466c97d72028eb5cb7fc8288e763ae155ee4a38de4d216cbb9b4c644c2e6659881cf6d33a3cb3ffff5f2294b6dbc60bb29fc
-  data.tar.gz: a5b78c77b463d95cb072d15948a6d4f934aa93ab51db650861391815873fa05e13b0317abb2889189f706380b4fd587ef143eac06a9ca181f681d98d099f3ed0
+  metadata.gz: 4f0b5af9258a98e3cd3af75523b5670716ea37a6c78d37b8951071602489ccbeee773605ee025ccf08aca905c21e139581349fe4c822f900d788493e69eb6e4e
+  data.tar.gz: 2f5ece4423c3742e50e104779d9a58ef8ca4a69870e8bec5a9851538c680615acba337a85be9d286c4f967341d223f2e71d7fcaa6cb7954058b03aadb04ccfb6

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
@@ -105,6 +106,10 @@ module Effective
       duplicate.tap { |page| page.save! }
     end
 
+    def menu_root_level
+      menu_parent.blank?
+    end
+
   end
 
 end

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

@@ -14,12 +14,13 @@
       = render '/admin/pages/form_page', page: page
 
     - if page.persisted?
-      = tab 'Content' do
-        = render '/admin/pages/form_content', 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.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'
 

data/lib/effective_pages/version.rb

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

metadata

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