trusty-multi-site-extension 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df7f77e56e68293fceaabe202449de32730dbfd3
-  data.tar.gz: 7eac58e0f5911361ad1c95d32f038d93ad242432
+  metadata.gz: 051525d2e6fb79b13a021a819ccd192bb9d1b975
+  data.tar.gz: 5a1ad1f30229359ebdd7272001dc4c1816806377
 SHA512:
-  metadata.gz: 9c0c4f271c00d68e7f8f123e94bdb151a522967905cb8288bc498d00e7a25e950375663a3f8c40d1e96441778a6b9ea2fa3be5c7a72d4a024dca5e9aa0c8717f
-  data.tar.gz: 1854a7d8840176260a53e0558e10b5989adb0e6d20782788aa5ad92a9352ebb961bdedacaff5e37231582543d6607e1b3f43641d620e8d19091ae9dd1f225094
+  metadata.gz: b79f839db9c3f701da91744368d5910337f065a2892f4b24dffa4e0fb5edb03785fdbd42addb329a0ec5bc9c5478acbdeba25de4e6f8bccdf32340ec8e416f46
+  data.tar.gz: e9c6645e09223dbddc1955c549806b66264c131f83710e52abba90f966bfb029887fbea0ccd29329446aa1f81ed2331d081b1598306d9c5a8877b50ecc604b81

data/lib/multi_site/pages_controller_extensions.rb

@@ -8,8 +8,8 @@ module MultiSite::PagesControllerExtensions
       responses.destroy.default do
         return_url = session[:came_from]
         session[:came_from] = nil
-        if model.class == Page
-          redirect_to return_url || admin_pages_url(:root => model.root.id)
+        if model.class == Page or model.class < Page
+          redirect_to return_url || admin_pages_url(:site_id => model.site.id)
         else
           redirect_to continue_url(params)
         end
@@ -43,6 +43,6 @@ module MultiSite::PagesControllerExtensions
   end
   
   def continue_url_with_site(options={})
-    options[:redirect_to] || (params[:continue] ? edit_admin_page_url(model) : admin_pages_url(:root => model.root.id))
+    options[:redirect_to] || (params[:continue] ? edit_admin_page_url(model) : admin_pages_url(:site_id => model.site.id))
   end
 end

data/trusty-multi-site-extension.gemspec

@@ -4,7 +4,7 @@ require "trusty-multi-site-extension"
 
 Gem::Specification.new do |s|
   s.name        = "trusty-multi-site-extension"
-  s.version = "2.0.4"
+  s.version = "2.0.5"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs", "Eric Sipple", "Danielle Greaves"]
   s.description = %q{Extends Trusty CMS Layouts to support multiple sites, defined by domain}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-multi-site-extension
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Sean Cribbs
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list