dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 13429 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-12-25 23:53:18 +0100
message:
  dv, svg request url fix + code cleanup
modified:
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/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-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-12-24 15:33:27 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/app.js	2013-12-25 22:51:31 +0000
@@ -1358,7 +1358,7 @@
 				Ext.query('#svgField')[0].value = svg;
 				Ext.query('#filenameField')[0].value = 'test';
 
-				form.action = '../../api/svg.' + type;
+				form.action = ns.core.init.contextPath + '/api/svg.' + type;
 				form.submit();
 			};
 		}());

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js	2013-12-05 12:11:45 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/core.js	2013-12-25 22:51:31 +0000
@@ -34,20 +34,7 @@
                     dataelement_get: 'dataElementGroups/',
                     dataelement_getall: 'dataElements.json?domainType=aggregate&paging=false&links=false',
                     dataelementgroup_get: 'dataElementGroups.json?paging=false&links=false',
-                    dataset_get: 'dataSets.json?paging=false&links=false',
-                    organisationunit_getbygroup: 'getOrganisationUnitPathsByGroup.action',
-                    organisationunit_getbylevel: 'getOrganisationUnitPathsByLevel.action',
-                    organisationunit_getbyids: 'getOrganisationUnitPaths.action',
-                    organisationunitgroup_getall: 'organisationUnitGroups.json?paging=false&links=false',
-                    organisationunitgroupset_get: 'getOrganisationUnitGroupSetsMinified.action',
-                    organisationunitlevel_getall: 'organisationUnitLevels.json?paging=false&links=false&viewClass=detailed',
-                    organisationunitchildren_get: 'getOrganisationUnitChildren.action',
-                    favorite_addorupdate: 'addOrUpdateChart.action',
-                    favorite_addorupdatesystem: 'addOrUpdateSystemChart.action',
-                    favorite_updatename: 'updateChartName.action',
-                    favorite_get: 'charts/',
-                    favorite_getall: 'getSystemAndCurrentUserCharts.action',
-                    favorite_delete: 'deleteCharts.action'
+                    dataset_get: 'dataSets.json?paging=false&links=false'
                 },
                 dimension: {
                     data: {