dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11860
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-09-02 12:47:40 +0200
message:
  event export, do not add links by default when exporting through UI
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/WebOptions.java
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm


--
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-api/src/main/java/org/hisp/dhis/api/controller/WebOptions.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/WebOptions.java	2013-08-23 16:00:30 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/WebOptions.java	2013-09-02 10:47:40 +0000
@@ -48,6 +48,11 @@
     // Getters for standard web options
     //--------------------------------------------------------------------------
 
+    public boolean hasLinks( boolean defaultValue )
+    {
+        return stringAsBoolean( options.get( "links" ), defaultValue );
+    }
+
     public boolean hasLinks()
     {
         return stringAsBoolean( options.get( "links" ), true );
@@ -57,7 +62,7 @@
     {
         return stringAsBoolean( options.get( "paging" ), true );
     }
-    
+
     public int getPage()
     {
         return stringAsInt( options.get( "page" ), 1 );
@@ -67,7 +72,7 @@
     {
         return stringAsString( options.get( "viewClass" ), defaultValue );
     }
-    
+
     public int getPageSize()
     {
         return stringAsInt( options.get( "pageSize" ), Pager.DEFAULT_PAGE_SIZE );

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm	2013-09-02 10:37:36 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/eventExportForm.vm	2013-09-02 10:47:40 +0000
@@ -26,6 +26,7 @@
 
         url += "&startDate=" + startDate;
         url += "&endDate=" + endDate;
+        url += "&links=false";
 
         window.location = url;
         console.log(url);