cmor_cms 0.0.55.pre → 0.0.56.pre

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bf551caf3690866dadf9f89ced1eb6a77bf85a8d52b262d6f4e67e3b7c7a1b66
4
- data.tar.gz: 2e0ae960a7b152d9c08a76323324916f77c155a6330ffceb6c3398ec9cedfdc7
3
+ metadata.gz: e51aeea1a91b966aea7c71809234008edf75d433d5be5b52c2e253fee34ad514
4
+ data.tar.gz: 8c18666a9988c579a3af488d331e733e7810dd7d7bfcdb9313acb86da9ce497c
5
5
  SHA512:
6
- metadata.gz: 786f2a27eb81b39133624eef109b980c91e6387a2a648eb26a62358d6246c24250f552ccc5d6e0edfaae11813a012284c0a9fae48452ae633eab00395ebf7072
7
- data.tar.gz: d212c339d25304e17e16f188b44702bfba24187aa03da07abd86227c4222b9b92243a6c44afd7f8d44946148338b1b2d805b9424a8c700b6d5a02e881cc8b3e1
6
+ metadata.gz: 22b1a5f888f2a292d68b4c613eba0d55a5dff16d0455a268c38ac5aef3b7a1b5bbdb557547a1f95e219b63963c987e563cd991f0c80df57e5facf03bff9276dd
7
+ data.tar.gz: 3fb57ccdc6cffe3e81c6c135c94817d71525559f15afcee27f92632920dc9185e2272ced7a0edc589fc533b9d430dcd87f2a06544770178d35bce51e51b0e12b
@@ -1,6 +1,8 @@
1
1
  Cmor::Cms::Engine.routes.draw do
2
2
  localized do
3
- get '/*page', to: 'page#respond', as: :page
3
+ get '/*page', to: 'page#respond', as: :page, constraints: lambda { |req|
4
+ req.path.exclude? 'rails/active_storage'
5
+ }
4
6
  get '/', to: 'page#respond', page: 'home'
5
7
  end
6
8
  end
@@ -55,8 +55,9 @@ module ActionView
55
55
  template = determine_template(options)
56
56
 
57
57
  prepend_formats(template.format)
58
-
59
- render_template(context, template, (template.layout || options[:layout]), options[:locals] || {})
58
+
59
+ layout = (template.respond_to?(:layout) ? template.layout : nil) || options[:layout]
60
+ render_template(context, template, (layout || options[:layout]), options[:locals] || {})
60
61
  end
61
62
  end
62
63
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cmor_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.55.pre
4
+ version: 0.0.56.pre
5
5
  platform: ruby
6
6
  authors:
7
7
  - Roberto Vasquez Angel
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-06-28 00:00:00.000000000 Z
11
+ date: 2020-07-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -30,28 +30,28 @@ dependencies:
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 0.0.55.pre
33
+ version: 0.0.56.pre
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 0.0.55.pre
40
+ version: 0.0.56.pre
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: cmor_core_frontend
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - '='
46
46
  - !ruby/object:Gem::Version
47
- version: 0.0.55.pre
47
+ version: 0.0.56.pre
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - '='
53
53
  - !ruby/object:Gem::Version
54
- version: 0.0.55.pre
54
+ version: 0.0.56.pre
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: sqlite3
57
57
  requirement: !ruby/object:Gem::Requirement