Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 9685 [merge]
committer: Jan Henrik Overland <[email protected]>
branch nick: dhis2
timestamp: Fri 2013-02-01 15:00:19 +0100
message:
(PT) Context path. Work in progress.
modified:
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js
--
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-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js 2013-02-01 10:03:40 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js 2013-02-01 13:58:56 +0000
@@ -928,7 +928,7 @@
Ext.data.JsonP.request({
method: 'GET',
- url: 'http://localhost:8080/api/analytics.jsonp' + paramString,
+ url: pt.init.contextPath + '/api/analytics.jsonp' + paramString,
params: {
filter: getFilterParamStringFromSettings()
},
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
