dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6530
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-04-09 10:25:59 +0700
message:
  SqlView - Removed session saving memory in used.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ExportSqlViewResultAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.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-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ExportSqlViewResultAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ExportSqlViewResultAction.java	2012-04-04 10:48:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/ExportSqlViewResultAction.java	2012-04-09 03:25:59 +0000
@@ -29,7 +29,6 @@
 
 import org.hisp.dhis.common.Grid;
 import org.hisp.dhis.sqlview.SqlViewService;
-import org.hisp.dhis.util.SessionUtils;
 
 import com.opensymphony.xwork2.Action;
 
@@ -66,13 +65,6 @@
         this.viewTableName = viewTableName;
     }
 
-    private boolean useLast;
-
-    public void setUseLast( boolean useLast )
-    {
-        this.useLast = useLast;
-    }
-
     public void setType( String type )
     {
         this.type = type;
@@ -107,16 +99,7 @@
 
     public String execute()
     {
-        if ( useLast )
-        {
-            grid = (Grid) SessionUtils.getSessionVar( SessionUtils.KEY_SQLVIEW_GRID );
-        }
-        else
-        {
-            grid = sqlViewService.getDataSqlViewGrid( viewTableName );
-        }
-
-        SessionUtils.setSessionVar( SessionUtils.KEY_SQLVIEW_GRID, grid );
+        grid = sqlViewService.getDataSqlViewGrid( viewTableName );
 
         return type != null ? type : DEFAULT_TYPE;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.js	2012-04-04 10:48:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/sqlView.js	2012-04-09 03:25:59 +0000
@@ -95,7 +95,7 @@
 
 function exportSqlView( type )
 {
-	var url = "exportSqlView.action?type=" + type + "&useLast=true";
+	var url = "exportSqlView.action?type=" + type;
 
     window.location.href = url;
 }
\ No newline at end of file