dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2405
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2010-12-21 12:04:23 +0700
message:
  Data admin - Sql View func - Fixed bug NullPointerException.
modified:
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlViewDesignTool.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-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java	2010-12-20 08:25:07 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/export/action/GenerateReportSupport.java	2010-12-21 05:04:23 +0000
@@ -128,8 +128,6 @@
 
     protected DataElementService dataElementService;
 
-    protected I18nFormat format;
-
     protected PeriodService periodService;
 
     protected PeriodGenericManager periodGenericManager;
@@ -148,6 +146,8 @@
 
     protected I18n i18n;
 
+    protected I18nFormat format;
+    
     // -------------------------------------------
     // Input & Output
     // -------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlViewDesignTool.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlViewDesignTool.js	2010-09-16 19:01:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlViewDesignTool.js	2010-12-21 05:04:23 +0000
@@ -175,19 +175,22 @@
 
 function getJoinQuery()
 {
+	var url = "autoJoinResourceTables.action?";
+	
+	for (var i in tableList)
+	{
+		url += "tableList=" + tableList[i];
+		url += (i < tableList.length-1) ? "&" : "";
+	}
+
 	$.getJSON(
-		"autoJoinResourceTables.action",
-		{
-			"tableList": tableList
-		},
-		function( json )
+		url, function( json )
 		{
 			fromQuery = json.result;
 			setUpQuery();
 		}
 	);
 }
-
 function setUpQuery()
 {
 	var index = "";