ishapi 0.1.8.158 → 0.1.8.162

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
  SHA256:
3
- metadata.gz: 655931d37948f431a17fb60910f348536e7c81a8cb140c8e588373b2ba0a6ad7
4
- data.tar.gz: 5e75f6c2718e975a0aef9d4779a7f42b71453c3696d23f4a93f16598f1037a64
3
+ metadata.gz: 7fa09912746d1a54e92a52ed51546cc456494013bbf086422b59245283d8d1d9
4
+ data.tar.gz: 6a6c0fed814e96ecf013ac7166c884d4bad34d674ef0fe7f8fb4c7d19a26905b
5
5
  SHA512:
6
- metadata.gz: 2a4bbac4620530ca6e35dee58dc40207b512ef7e826cb3d1601924c9dce42202b9b52095f56f4259b9cba40dc12b315dd3b51e2920577e3214e743c9bb409641
7
- data.tar.gz: 9a3ffb107104f0300ea97a22ab62601b1ed2945fcce753b4d38886a5da1c179effe23b41067b593c09bc783ffcd044f7dd1c04e7db71e81cac56036a7610d177
6
+ metadata.gz: 923863eddd777cdbd6f01509fd59ac5de72544cd88277f6c6247052bc2da9975ece2a62a56b3debe6ce804adcda1c546fec8c3b75215731a66ce3a05f31fa9b7
7
+ data.tar.gz: e4cf17ccc87fc3bfaade2e5b3c90f0ea526acc16ab3079231f04f8783b5364896d7d68fa73d3d5cc28d5a7590827768dce66e764f94b3b5cd2db7a390d3b7fd7
@@ -4,7 +4,7 @@
4
4
 
5
5
  ## @TODO: make sure that _show.jbuilder and show.jbuilder are reasonably deduped
6
6
 
7
- this_key = [ map, params.permit! ]
7
+ this_key = [ map.id, map.updated_at, params.permit! ]
8
8
  json.cache! this_key do
9
9
  json.map do
10
10
  json.id map.id.to_s
@@ -16,6 +16,15 @@ json.cache! this_key do
16
16
 
17
17
  if @map.map
18
18
  json.partial! 'ishapi/maps/show', map: @map.map
19
+ json.config JSON.parse @map.parent.config
20
+ json.labels JSON.parse @map.parent.labels
21
+ json.partial! 'ishapi/markers/index', map: @map.map
22
+ else
23
+ ## I removed json parsing from here! _vp_ 2021-10-14
24
+ ## I added json parsing here! _vo_ 2021-10-19
25
+ json.config JSON.parse @map.config
26
+ json.labels JSON.parse @map.labels
27
+ json.partial! 'ishapi/markers/index', map: @map
19
28
  end
20
29
 
21
30
  json.breadcrumbs do
@@ -26,18 +35,6 @@ json.cache! this_key do
26
35
  end
27
36
  end
28
37
 
29
- ## I removed json parsing from here! _vp_ 2021-10-14
30
- ## I added json parsing here! _vo_ 2021-10-19
31
- if @map.parent_slug.present?
32
- json.config JSON.parse @map.parent.config
33
- json.labels JSON.parse @map.parent.labels
34
- else
35
- json.config JSON.parse @map.config
36
- json.labels JSON.parse @map.labels
37
- end
38
-
39
- json.partial! 'ishapi/markers/index', map: @map
40
-
41
38
  if @newsitems
42
39
  json.partial! 'ishapi/newsitems/index', :newsitems => @newsitems
43
40
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ishapi
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.158
4
+ version: 0.1.8.162
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-11-03 00:00:00.000000000 Z
11
+ date: 2021-11-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails