dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2139
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Thu 2010-09-16 16:29:20 +0200
message:
  Report, skipping popup, sending report as attachment directly
modified:
  dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/report.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-reporting/src/main/webapp/dhis-web-reporting/javascript/report.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/report.js	2010-07-05 23:45:39 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/report.js	2010-09-16 14:29:20 +0000
@@ -16,6 +16,8 @@
 
 function runAndViewReport( reportId, reportUrl )
 {
+    setWaitMessage( i18n_please_wait );
+        
     var url = "createTable.action?id=" + reportId + "&doDataMart=" + getListValue( "doDataMart" ) + "&mode=report";
     
     if ( document.getElementById( "reportingPeriod" ) != null )
@@ -64,7 +66,7 @@
     {
         setMessage( i18n_process_completed );
         
-        viewReport( tempUrl );        
+        window.location.href = tempUrl;
     }
     else if ( statusMessage == null )
     {
@@ -85,12 +87,6 @@
     setTimeout( "getReportStatus();", millis );
 }
 
-function viewReport( url )
-{
-	var dialog = window.open( url, "_blank", "directories=no, height=800, width=800, \
-		location=no, menubar=no, status=no, toolbar=no, resizable=yes, scrollbars=yes" );
-}
-
 function addReport()
 {
     selectAllById( "selectedReportTables" );