dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #28752
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14397: removed lastUpdated query parameter from crudController, can now be done through filter functiona...
------------------------------------------------------------
revno: 14397
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-03-25 11:24:56 +0100
message:
removed lastUpdated query parameter from crudController, can now be done through filter functionality
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Options.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java
--
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-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Options.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Options.java 2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Options.java 2014-03-25 10:24:56 +0000
@@ -220,7 +220,7 @@
{
return getDate( "lastUpdated" );
}
-
+
//--------------------------------------------------------------------------
// Adding options
//--------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java 2014-03-25 10:14:39 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java 2014-03-25 10:24:56 +0000
@@ -295,13 +295,7 @@
{
List<T> entityList;
- Date lastUpdated = options.getLastUpdated();
-
- if ( lastUpdated != null )
- {
- entityList = new ArrayList<T>( manager.getByLastUpdatedSorted( getEntityClass(), lastUpdated ) );
- }
- else if ( options.hasPaging() )
+ if ( options.hasPaging() )
{
int count = manager.getCount( getEntityClass() );