=== 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 2013-03-11 15:11:59 +0000 +++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/app.js 2013-03-11 15:39:06 +0000 @@ -45,8 +45,11 @@ } init.afterRender = function() { + + // Left gui pt.cmp.dimension.panels[0].expand(); + // Resize event handler pt.viewport.westRegion.on('resize', function() { var panel = pt.util.dimension.panel.getExpanded(); @@ -54,6 +57,13 @@ panel.onExpand(); } }); + + // Load favorite from url + var id = pt.util.url.getUrlParam('id'); + + if (id) { + pt.util.pivot.loadTable(id); + } }; return init; @@ -181,6 +191,27 @@ return config; }; + util.url = { + getUrlParam: function(s) { + var output = ''; + var href = window.location.href; + if (href.indexOf('?') > -1 ) { + var query = href.substr(href.indexOf('?') + 1); + var query = query.split('&'); + for (var i = 0; i < query.length; i++) { + if (query[i].indexOf('=') > -1) { + var a = query[i].split('='); + if (a[0].toLowerCase() === s) { + output = a[1]; + break; + } + } + } + } + return unescape(output); + } + }; + return util; }; === 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-03-11 15:27:07 +0000 +++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js 2013-03-11 15:39:06 +0000 @@ -1613,7 +1613,7 @@ } Ext.Ajax.request({ - url: pt.baseUrl + '/api/reportTables/' + id + '.jsonp?links=false', + url: pt.baseUrl + '/api/reportTables/' + id + '.json?links=false', method: 'GET', failure: function(r) { pt.util.mask.hideMask();