dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1815
committer: hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-04-27 10:25:54 +0700
message:
  Minor fixed
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.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-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java	2010-04-14 09:23:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/SearchAction.java	2010-04-27 03:25:54 +0000
@@ -475,7 +475,6 @@
             {
                 dataBrowserTable = dataBrowserService.getOrgUnitsInPeriod( selectedUnit.getId(), fromDate, toDate,
                     periodType );
-
             }
             else
             {
@@ -498,15 +497,6 @@
         // Set DataBrowserTable variable for PDF export
         setExportPDFVariables();
 
-        // Get format standard for periods which appropriate with from date, to
-        // date and period type
-        fromToDate = dataBrowserService.getFromToDateFormat( periodType, fromDate, toDate, format );
-
-        if ( fromToDate == null )
-        {
-            fromToDate = "";
-        }
-
         return SUCCESS;
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm	2010-04-13 06:00:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataBrowserResult.vm	2010-04-27 03:25:54 +0000
@@ -117,10 +117,6 @@
 	    <strong>$i18n.getString( "from_date" ):</strong> $i18n.getString( "earliest" ) 
 	    <strong>$i18n.getString( "to_date" ):</strong> $i18n.getString( "latest" ) 
 	    <strong>$i18n.getString( "period_type" ):</strong> $periodTypeId
-	#elseif ( $fromToDate != "" )
-	    <strong>$i18n.getString( "from_date" ):</strong> $fromToDate
-		<br/>
-		<strong>$i18n.getString( "period_type" ):</strong> $periodTypeId
 	#else
 	    <strong>$i18n.getString( "from_date" ):</strong> $fromDate
 	    <strong>$i18n.getString( "to_date" ):</strong> $toDate