=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/LockException.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/LockException.java 2012-02-08 12:04:46 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/LockException.java 2012-02-14 07:18:00 +0000 @@ -50,7 +50,12 @@ public String getName() { - return dataSet.getName() + " - " + organisationUnit.getName() + " - " + period.getName(); + if ( organisationUnit == null ) + { + return dataSet.getName() + " (" + period.getName() + ")"; + } + + return dataSet.getName() + " (" + organisationUnit.getName() + ", " + period.getName() + ")"; } public int getId() === added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/LockExceptionNameComparator.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/LockExceptionNameComparator.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/comparator/LockExceptionNameComparator.java 2012-02-14 07:18:00 +0000 @@ -0,0 +1,45 @@ +package org.hisp.dhis.dataset.comparator; + +/* + * Copyright (c) 2004-2012, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import org.hisp.dhis.dataset.LockException; + +import java.util.Comparator; + +/** + * @author Morten Olav Hansen + */ +public class LockExceptionNameComparator + implements Comparator +{ + @Override + public int compare( LockException e, LockException e1 ) + { + return e.getName().compareTo( e1.getName() ); + } +} === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/GetLockExceptionListAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/GetLockExceptionListAction.java 2012-02-14 02:58:08 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/GetLockExceptionListAction.java 2012-02-14 07:18:00 +0000 @@ -29,10 +29,12 @@ import org.hisp.dhis.dataset.DataSetService; import org.hisp.dhis.dataset.LockException; +import org.hisp.dhis.dataset.comparator.LockExceptionNameComparator; import org.hisp.dhis.i18n.I18nFormat; import org.hisp.dhis.paging.ActionPagingSupport; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -96,14 +98,14 @@ lockException.getPeriod().setName( format.formatPeriod( lockException.getPeriod() ) ); } + Collections.sort( lockExceptions, new LockExceptionNameComparator() ); + if ( usePaging ) { paging = createPaging( dataSetService.getLockExceptionCount() ); lockExceptions = lockExceptions.subList( paging.getStartPos(), paging.getEndPos() ); } - dataSetService.getLockExceptionCombinations(); - return SUCCESS; } } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/PrepareBatchRemovalAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/PrepareBatchRemovalAction.java 2012-02-14 02:58:08 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lockexception/PrepareBatchRemovalAction.java 2012-02-14 07:18:00 +0000 @@ -30,9 +30,11 @@ import com.opensymphony.xwork2.Action; import org.hisp.dhis.dataset.DataSetService; import org.hisp.dhis.dataset.LockException; +import org.hisp.dhis.dataset.comparator.LockExceptionNameComparator; import org.hisp.dhis.i18n.I18nFormat; import java.util.ArrayList; +import java.util.Collections; import java.util.List; /** @@ -85,6 +87,8 @@ } + Collections.sort( lockExceptions, new LockExceptionNameComparator() ); + return SUCCESS; } } === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/removeLockExceptionBatch.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/removeLockExceptionBatch.vm 2012-02-14 02:58:08 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/removeLockExceptionBatch.vm 2012-02-14 07:18:00 +0000 @@ -62,10 +62,9 @@ #foreach( $lockException in $lockExceptions ) - #set( $name = "$encoder.htmlEncode( $lockException.dataSet.name ) - $encoder.htmlEncode( $lockException.period.name )" ) - $name + $encoder.htmlEncode( $lockException.name ) - $i18n.getString( 'remove' ) + $i18n.getString( 'remove' ) #end