ishapi 0.1.8.160 → 0.1.8.161
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/views/ishapi/maps/show.jbuilder +7 -10
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: ceedcb320e4c54ce7266018ee527778921f9d8c026db2ddebda1bbba1ff644c4
|
|
4
|
+
data.tar.gz: 5cab2210c23259864f3ab2b26dff5972e1b3325bcf6afffa56abb2dd553082e7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: af6ca19fdc68d01e11e69ec5cdb2f1763f7f3105fc50211b84af33e694457bcbb3cc22e208584ce0984baa58d788c06d3a860d35a53b685a718391f02c7acb92
|
|
7
|
+
data.tar.gz: f8d5084151e39b07507a4448c470c05f7dfff5f773c2934cc2f151bb5ec136e37a289d1719f07c9fae2f66ed88638776c25d917fc8391a42f553343d2e1479d6
|
|
@@ -16,6 +16,13 @@ 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
|
+
else
|
|
22
|
+
## I removed json parsing from here! _vp_ 2021-10-14
|
|
23
|
+
## I added json parsing here! _vo_ 2021-10-19
|
|
24
|
+
json.config JSON.parse @map.config
|
|
25
|
+
json.labels JSON.parse @map.labels
|
|
19
26
|
end
|
|
20
27
|
|
|
21
28
|
json.breadcrumbs do
|
|
@@ -26,16 +33,6 @@ json.cache! this_key do
|
|
|
26
33
|
end
|
|
27
34
|
end
|
|
28
35
|
|
|
29
|
-
## Hmm with austin -> wasya_co , neither config nor labels can be used from parent.
|
|
30
|
-
# if @map.parent_slug.present?
|
|
31
|
-
# json.config JSON.parse @map.parent.config
|
|
32
|
-
# json.labels JSON.parse @map.parent.labels
|
|
33
|
-
# else
|
|
34
|
-
## I removed json parsing from here! _vp_ 2021-10-14
|
|
35
|
-
## I added json parsing here! _vo_ 2021-10-19
|
|
36
|
-
json.config JSON.parse @map.config
|
|
37
|
-
json.labels JSON.parse @map.labels
|
|
38
|
-
|
|
39
36
|
json.partial! 'ishapi/markers/index', map: @map
|
|
40
37
|
|
|
41
38
|
if @newsitems
|