trusty-multi-site-extension 2.0.4 → 2.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: df7f77e56e68293fceaabe202449de32730dbfd3
4
- data.tar.gz: 7eac58e0f5911361ad1c95d32f038d93ad242432
3
+ metadata.gz: 051525d2e6fb79b13a021a819ccd192bb9d1b975
4
+ data.tar.gz: 5a1ad1f30229359ebdd7272001dc4c1816806377
5
5
  SHA512:
6
- metadata.gz: 9c0c4f271c00d68e7f8f123e94bdb151a522967905cb8288bc498d00e7a25e950375663a3f8c40d1e96441778a6b9ea2fa3be5c7a72d4a024dca5e9aa0c8717f
7
- data.tar.gz: 1854a7d8840176260a53e0558e10b5989adb0e6d20782788aa5ad92a9352ebb961bdedacaff5e37231582543d6607e1b3f43641d620e8d19091ae9dd1f225094
6
+ metadata.gz: b79f839db9c3f701da91744368d5910337f065a2892f4b24dffa4e0fb5edb03785fdbd42addb329a0ec5bc9c5478acbdeba25de4e6f8bccdf32340ec8e416f46
7
+ data.tar.gz: e9c6645e09223dbddc1955c549806b66264c131f83710e52abba90f966bfb029887fbea0ccd29329446aa1f81ed2331d081b1598306d9c5a8877b50ecc604b81
@@ -8,8 +8,8 @@ module MultiSite::PagesControllerExtensions
8
8
  responses.destroy.default do
9
9
  return_url = session[:came_from]
10
10
  session[:came_from] = nil
11
- if model.class == Page
12
- redirect_to return_url || admin_pages_url(:root => model.root.id)
11
+ if model.class == Page or model.class < Page
12
+ redirect_to return_url || admin_pages_url(:site_id => model.site.id)
13
13
  else
14
14
  redirect_to continue_url(params)
15
15
  end
@@ -43,6 +43,6 @@ module MultiSite::PagesControllerExtensions
43
43
  end
44
44
 
45
45
  def continue_url_with_site(options={})
46
- options[:redirect_to] || (params[:continue] ? edit_admin_page_url(model) : admin_pages_url(:root => model.root.id))
46
+ options[:redirect_to] || (params[:continue] ? edit_admin_page_url(model) : admin_pages_url(:site_id => model.site.id))
47
47
  end
48
48
  end
@@ -4,7 +4,7 @@ require "trusty-multi-site-extension"
4
4
 
5
5
  Gem::Specification.new do |s|
6
6
  s.name = "trusty-multi-site-extension"
7
- s.version = "2.0.4"
7
+ s.version = "2.0.5"
8
8
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
9
9
  s.authors = ["Sean Cribbs", "Eric Sipple", "Danielle Greaves"]
10
10
  s.description = %q{Extends Trusty CMS Layouts to support multiple sites, defined by domain}
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-multi-site-extension
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.4
4
+ version: 2.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Cribbs
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2015-09-21 00:00:00.000000000 Z
13
+ date: 2015-12-23 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: acts_as_list