dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9719
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-02-05 13:57:50 +0700
message:
  FRED-API: minor map fix, use url from facility
modified:
  dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facilities.vm


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facilities.vm'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facilities.vm	2012-12-10 13:53:34 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/webapp/WEB-INF/api-fred-velocity/v1/facilities.vm	2013-02-05 06:57:50 +0000
@@ -8,6 +8,7 @@
         #foreach( $facility in $entity.facilities )
         {
             id: "$facility.id",
+            url: "$facility.url",
             name: "$esc.escapeEcmaScript($facility.name)",
             coordinates: "$facility.coordinates"
         },
@@ -39,6 +40,7 @@
                 var latlng = new google.maps.LatLng(coords[1], coords[0]);
                 var name = item.name;
                 var id = item.id;
+                var url = item.url;
 
                 lats += coords[1];
                 lngs += coords[0];
@@ -53,7 +55,7 @@
 
                 var infoWindow= new google.maps.InfoWindow({
                     content: "<div>" + "<b>" + name + "</b><br/>Latitude " + coords[1] + "<br/> Longitude " + coords[0] +
-                            "<br/><br/><a href='$baseUrl/facilities/" + id + "'>More information</a></div>"
+                            "<br/><br/><a href='" + url + "'>More information</a></div>"
                 });
 
                 infoWindows.push(infoWindow);