dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 12632 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-10-14 13:40:35 +0200
message:
  (PT, DV) Plugin fixes.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js
  dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/plugin.html


--
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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js	2013-10-13 21:03:02 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js	2013-10-14 11:39:50 +0000
@@ -2484,7 +2484,7 @@
 		};
 
 		requests.push({
-			url: config.url + '/api/system/info',
+			url: config.url + '/api/system/info.jsonp',
 			success: function(r) {
 				init.contextPath = r.contextPath;
 				fn();

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js	2013-10-13 21:03:02 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js	2013-10-14 11:39:50 +0000
@@ -2797,7 +2797,7 @@
 		};
 
 		requests.push({
-			url: config.url + '/api/system/info',
+			url: config.url + '/api/system/info.jsonp',
 			success: function(r) {
 				init.contextPath = r.contextPath;
 				fn();

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/plugin.html'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/plugin.html	2013-10-13 12:41:41 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/plugin.html	2013-10-14 11:39:50 +0000
@@ -4,11 +4,7 @@
 
 	<link rel="stylesheet" type="text/css" href="http://localhost:8080/dhis-web-commons/javascripts/ext/resources/css/ext-plugin-gray.css"; />
 	<script src="http://localhost:8080/dhis-web-commons/javascripts/ext/ext-all.js";></script>
-<!--
 	<script src="http://localhost:8080/dhis-web-commons/javascripts/plugin/table.js";></script>
--->
-	<script src="http://localhost:8080/dhis-web-pivot/app/scripts/core.js";></script>
-	<script src="http://localhost:8080/dhis-web-pivot/app/scripts/plugin.js";></script>
 
     <style type="text/css">
 		body {font-family:sans-serif; margin:0 0 0 60px;}