dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 12691 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-15 19:38:17 +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/scripts/plugin.js
  dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/plugin.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-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-14 13:30:51 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/chart.js	2013-10-15 17:37:29 +0000
@@ -2592,8 +2592,8 @@
 			dv.isPlugin = true;
 			dv.viewport = createViewport();
 
-			if (config.uid) {
-				dv.engine.loadChart(config.uid, dv);
+			if (config.id) {
+				dv.engine.loadChart(config.id, dv);
 			}
 			else {
 				layout = dv.api.layout.Layout(config);

=== 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-14 13:30:51 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/plugin/table.js	2013-10-15 17:37:29 +0000
@@ -2907,8 +2907,8 @@
 			pt.viewport = createViewport();
 			pt.isPlugin = true;
 
-			if (config.uid) {
-				pt.engine.loadTable(config.uid, pt);
+			if (config.id) {
+				pt.engine.loadTable(config.id, pt);
 			}
 			else {
 				layout = pt.api.layout.Layout(config);

=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.js	2013-10-14 13:30:51 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/plugin.js	2013-10-15 17:37:29 +0000
@@ -167,8 +167,8 @@
 			pt.viewport = createViewport();
 			pt.isPlugin = true;
 
-			if (config.uid) {
-				pt.engine.loadTable(config.uid, pt);
+			if (config.id) {
+				pt.engine.loadTable(config.id, pt);
 			}
 			else {
 				layout = pt.api.layout.Layout(config);

=== modified file 'dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/plugin.js'
--- dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/plugin.js	2013-10-14 13:30:51 +0000
+++ dhis-2/dhis-web/dhis-web-visualizer/src/main/webapp/dhis-web-visualizer/app/scripts/plugin.js	2013-10-15 17:37:29 +0000
@@ -152,8 +152,8 @@
 			dv.isPlugin = true;
 			dv.viewport = createViewport();
 
-			if (config.uid) {
-				dv.engine.loadChart(config.uid, dv);
+			if (config.id) {
+				dv.engine.loadChart(config.id, dv);
 			}
 			else {
 				layout = dv.api.layout.Layout(config);