Changes for page Homeopaths

Last modified by Jip-jan Alunkel on March 14, 20:13
From version 8.77
edited by Jip-jan Alunkel
on December 08, 16:30
Change comment: Renamed from xwiki:practices.WebHome
To version 8.71
edited by Jip-jan Alunkel
on December 08, 16:24
Change comment: Renamed from xwiki:practices.WebHome

Summary

Details

Page properties
Content
... ... @@ -9,31 +9,6 @@
9 9  {{html wiki="false" clean="false"}}
10 10  <p>
11 11  All about homeopaths.
12 - #set($query = $services.query.xwql("from doc.object('homeopaths.Code.homeopathsClass') as homeopathObj"))
13 - #set($result = $query.execute())
14 - #set($map = {})
15 - #foreach($item in $result)
16 - #set($result_doc = $xwiki.getDocument("${item}"))
17 - #set($result_obj = $result_doc.getObject("homeopaths.Code.homeopathsClass"))
18 - #set($addressArray = $result_obj.getProperty("address").value.split(","))
19 - #set($address = "")
20 - #foreach($address_item in $addressArray)
21 - #if($foreach.hasNext)
22 - #set($linebreak = "<br />")
23 - #else
24 - #set($linebreak = "")
25 - #end
26 - #set($address = "${address}${address_item.trim()}${linebreak}")
27 - #end
28 - #set($info = "<h4>${stringtool.capitalize($result_doc.documentReference.getName())}</h4><address>${address}</address>")
29 - #set($discard = $map.put($info, $result_obj.getProperty("latlong").value))
30 - #end
31 - #if($objecttool.allNull($map))
32 - #set($mapJSON = {})
33 - #else
34 - #set($mapJSON = $jsontool.serialize(${map}))
35 - #end
36 -$map
37 37  </p>
38 38  <div id="homeopaths_map"></div>
39 39  
XWiki.JavaScriptExtension[0]
Code
... ... @@ -10,17 +10,11 @@
10 10   #set($map = {})
11 11   #foreach($item in $result)
12 12   #set($result_doc = $xwiki.getDocument("${item}"))
13 + #set($spaceReference = $services.model.resolveDocument('', 'default', $result_doc.documentReference.lastSpaceReference).parent)
14 + #set($spaceName = $spaceReference.getName())
13 13   #set($result_obj = $result_doc.getObject("homeopaths.Code.homeopathsClass"))
14 14   #set($addressArray = $result_obj.getProperty("address").value.split(","))
15 15   #set($address = "")
16 - #foreach($address_item in $addressArray)
17 - #if($foreach.hasNext)
18 - #set($linebreak = "<br />")
19 - #else
20 - #set($linebreak = "")
21 - #end
22 - #set($address = "${address}${address_item.trim()}${linebreak}")
23 - #end
24 24   #set($info = "<h4>${stringtool.capitalize($result_doc.documentReference.getName())}</h4><address>${address}</address>")
25 25   #set($discard = $map.put($info, $result_obj.getProperty("latlong").value))
26 26   #end
... ... @@ -39,7 +39,6 @@
39 39   latlongArray = [long, lat, property];
40 40   markers.push(latlongArray)
41 41   }
42 -console.log(markers);
43 43  
44 44   for (var i=0; i<markers.length; i++) {
45 45   let lon = markers[i][0],