Changes for page Homeopaths
Last modified by Jip-jan Alunkel on March 14, 20:13
From version 10.51
edited by Jip-jan Alunkel
on March 14, 19:39
on March 14, 19:39
Change comment:
Renamed from xwiki:practices.WebHome
To version 10.56
edited by Jip-jan Alunkel
on March 14, 20:00
on March 14, 20:00
Change comment:
Renamed from xwiki:practices.WebHome
Summary
-
Page properties (1 modified, 0 added, 0 removed)
-
Objects (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -9,10 +9,6 @@ 9 9 {{html wiki="false" clean="false"}} 10 10 <p> 11 11 All about the page "homeopaths". Where is it for? 12 - #set($q = $services.query.xwql("from doc.object(homeopaths.Code.homeopathsClass) as homepath where homepath.doc_owner like :usr")) 13 - #set($usrName = $xwiki.getDocument($xcontext.getUserReference()).getFullName()) 14 - #set($r = $aq.bindValue('usr',"${usrName}").execute()) 15 -$r.size() > 0 16 16 </p> 17 17 <div id="homeopaths_map"></div> 18 18 #if(!$isGuest)
- XWiki.JavaScriptExtension[0]
-
- Code
-
... ... @@ -13,16 +13,19 @@ 13 13 #foreach($item in $result) 14 14 #set($result_doc = $xwiki.getDocument("${item}")) 15 15 #set($result_obj = $result_doc.getObject("homeopaths.Code.homeopathsClass")) 16 - #set($addressArray = $result_obj.getProperty("address").value.split(",")) 17 - #set($address = "") 18 - #foreach($address_item in $addressArray) 19 - #if($foreach.hasNext) 20 - #set($linebreak = "<br />") 21 - #else 22 - #set($linebreak = "") 16 + 17 + #set($addressArray = ['pmStreet','pmHousenumber','pmPostcode','pmCity','pmState','pmCounty','pmCountry']) 18 + #set($x = {}) 19 + #foreach($datapart in $addressArray) 20 + #if($result_obj.getProperty($datapart)) 21 + #set($datapart4Publish = $result_obj.getProperty($datapart).value) 22 + #if($datapart == 'pmCountry') 23 + #set($datapart4Publish = $datapart4Publish.toUpperCase()) 24 + #end 25 + #set($discard = $x.put("$datapart", $datapart4Publish)) 23 23 #end 24 - #set($address = "${address}${address_item.trim()}${linebreak}") 25 25 #end 28 + #set($address = "$doc.getTitle()<br />$x['pmStreet'] $x['pmHousenumber']<br />$x['pmPostcode'] $x['pmCity']<br />$x['pmCounty'] $x['pmState']<br />$x['pmCountry']") 26 26 #set($info = "<h4><a href='$xwiki.getURL($result_doc.documentReference)'>${stringtool.capitalize($result_doc.getDisplayTitle())}</a></h4><address>${address}</address>") 27 27 #set($discard = $map.put($info, $result_obj.getProperty("latlong").value)) 28 28 #end ... ... @@ -31,6 +31,7 @@ 31 31 #else 32 32 #set($mapJSON = $jsontool.serialize(${map})) 33 33 #end 37 +console.log("$mapJSON"); 34 34 35 35 var mapJSON = $jsontool.parse($mapJSON), 36 36 markers = [];