------------------------------------------------------------ revno: 13565 committer: Lars Helge Øverland <[email protected]> branch nick: dhis2 timestamp: Fri 2014-01-03 18:02:12 +0100 message: PT, impl dynamic base url for plugin config modified: dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.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/app.js' --- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-01-03 16:44:44 +0000 +++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2014-01-03 17:02:12 +0000 @@ -4805,7 +4805,7 @@ text += '<script src="http://dhis2-cdn.org/v214/ext/ext-all.js";></script>\n'; text += '<script src="http://dhis2-cdn.org/v214/plugin/table.js";></script>\n\n'; text += '<script>\n'; - text += 'var base = "http://apps.dhis2.org/demo";\n\n'; + text += 'var base = "' + ns.core.init.host + '";\n\n'; text += 'DHIS.getTable( url: base, el: "table1", ' + JSON.stringify(ns.core.service.layout.layout2plugin(ns.app.layout, 'table1'), null, 2) + ');\n'; text += '</script>\n</head>\n\n<body>\n'; text += '<div id="table1"></div>\n'; @@ -5491,6 +5491,15 @@ fn(); } }); + + // host url + requests.push({ + url: init.contextPath + '/api/system/context.json', + success: function(r) { + init.host = Ext.decode(r.responseText).contextPath || ''; + fn(); + } + }); for (var i = 0; i < requests.length; i++) { Ext.Ajax.request(requests[i]);
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
