hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-2992] Selection list for metadata in edit item or item template is not sorted alphabetically anymore

Browse Source
This commit is contained in:
KevinVdV
2016-01-28 12:27:45 +01:00
parent 592207245c
commit 543ed0d669
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataFieldDAOImpl.java
View File

@@ -13,6 +13,7 @@ import org.dspace.content.dao.MetadataFieldDAO;
import org.dspace.core.Context;
import org.dspace.core.AbstractHibernateDAO;
import org.hibernate.Criteria;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import java.sql.SQLException;
@@ -56,6 +57,13 @@ public class MetadataFieldDAOImpl extends AbstractHibernateDAO<MetadataField> im
return singleResult(criteria);
}
@Override
public List<MetadataField> findAll(Context context, Class<MetadataField> clazz) throws SQLException {
Criteria criteria = createCriteria(context, MetadataField.class);
criteria.createAlias("metadataSchema", "s").addOrder(Order.asc("s.name")).addOrder(Order.asc("element")).addOrder(Order.asc("qualifier"));
return list(criteria);
}
@Override
public MetadataField findByElement(Context context, String metadataSchema, String element, String qualifier) throws SQLException
{
@@ -88,7 +96,9 @@ public class MetadataFieldDAOImpl extends AbstractHibernateDAO<MetadataField> im
public List<MetadataField> findAllInSchema(Context context, MetadataSchema metadataSchema) throws SQLException {
// Get all the metadatafieldregistry rows
Criteria criteria = createCriteria(context, MetadataField.class);
criteria.createAlias("metadataSchema", "s");
criteria.add(Restrictions.eq("metadataSchema", metadataSchema));
criteria.addOrder(Order.asc("s.name")).addOrder(Order.asc("element")).addOrder(Order.asc("qualifier"));
return list(criteria);
}
}