effective_pages 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e0857bc336aef11ee45b65b154b193c4678cd1b
-  data.tar.gz: 56fc281dce56d5538ff770985bea2ac49e62a5d7
+  metadata.gz: a79dbb57c52dbba7a942dc5ab61f99dea6c2a425
+  data.tar.gz: 2ff4f3480deba1e9393b951263f49cbd400cdfd6
 SHA512:
-  metadata.gz: 328465e88b51fc487005c9513c2e226c190a5e603509da2b40a5536647f8e4b6bb21b3eb2bbc36c621c48a40cbc205cb67bc582bdc69ce82dd7b75da41bedb06
-  data.tar.gz: 9da42b2ff1d138482de523a5cc4c8f655d46df5946e78fc9e07ce648dc0c1778ca6c76469995603f1745ef28005332444c5039a56d076a31c5ec9d6531caa88b
+  metadata.gz: 5a9d35738f11252819d50d853d94b310295e54baea224b899d061e8d248a181b8cbe5c213343990b38f5e0505ac82d0725d9f0f9120af59397e3ec412a0678a3
+  data.tar.gz: 19e5d44b424479ade5d01d74fdfd60ee93b0ea9423cc96d31bf13a310130d24e941511ec20cf79676be38f24bd586f8f3a1a5e70bc477564fd73032717087a0d

data/app/controllers/admin/pages_controller.rb

@@ -33,6 +33,8 @@ module Admin
       if @page.save
         if params[:commit] == 'Save and Edit Content' && defined?(EffectiveRegions)
           redirect_to effective_regions.edit_path(effective_pages.page_path(@page))
+        elsif params[:commit] == 'Save and Add New'
+          redirect_to effective_pages.new_admin_page_path
         else
           flash[:success] = 'Successfully created page'
           redirect_to effective_pages.edit_admin_page_path(@page)
@@ -59,6 +61,8 @@ module Admin
       if @page.update_attributes(page_params)
         if params[:commit] == 'Save and Edit Content' && defined?(EffectiveRegions)
           redirect_to effective_regions.edit_path(effective_pages.page_path(@page))
+        elsif params[:commit] == 'Save and Add New'
+          redirect_to effective_pages.new_admin_page_path
         else
           flash[:success] = 'Successfully updated page'
           redirect_to effective_pages.edit_admin_page_path(@page)

data/app/models/effective/menu.rb

@@ -20,7 +20,7 @@ module Effective
 
     def self.update_from_effective_regions!(params)
       (params || {}).each do |menu_id, attributes|
-        menu = Effective::Menu.find(menu_id)
+        menu = Effective::Menu.includes(:menu_items).find(menu_id)
 
         attributes[:menu_items_attributes].each { |_, atts| atts[:menuable_type] = 'Effective::Page' if atts[:menuable_type].blank? }
         menu.attributes = attributes

data/app/models/effective/page.rb

@@ -4,6 +4,8 @@ module Effective
     acts_as_role_restricted if defined?(EffectiveRoles)
     acts_as_regionable if defined?(EffectiveRegions)
 
+    has_many :menu_items, :as => :menuable, :dependent => :destroy
+
     self.table_name = EffectivePages.pages_table_name.to_s
 
     structure do

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

@@ -28,4 +28,5 @@
           = f.button :submit, 'Save'
           - if defined?(EffectiveRegions)
             = f.button :submit, 'Save and Edit Content'
+          = f.button :submit, 'Save and Add New'
           = link_to 'Cancel', effective_pages.admin_pages_path

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '0.9.1'.freeze
+  VERSION = '0.9.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: effective_regions
   requirement: !ruby/object:Gem::Requirement