ItEr41S20CUGravacionModelosUnidadesTraballoItEr40S25: Only showing root templates
This commit is contained in:
parent
a307b549e1
commit
028c26afb9
5 changed files with 21 additions and 4 deletions
|
|
@ -19,6 +19,8 @@
|
|||
*/
|
||||
package org.navalplanner.business.templates.daos;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.navalplanner.business.common.daos.IGenericDAO;
|
||||
import org.navalplanner.business.templates.entities.OrderElementTemplate;
|
||||
|
||||
|
|
@ -29,4 +31,6 @@ import org.navalplanner.business.templates.entities.OrderElementTemplate;
|
|||
public interface IOrderElementTemplateDAO extends
|
||||
IGenericDAO<OrderElementTemplate, Long> {
|
||||
|
||||
List<OrderElementTemplate> getRootTemplates();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,11 +19,15 @@
|
|||
*/
|
||||
package org.navalplanner.business.templates.daos;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.hibernate.Query;
|
||||
import org.navalplanner.business.common.daos.GenericDAOHibernate;
|
||||
import org.navalplanner.business.templates.entities.OrderElementTemplate;
|
||||
import org.springframework.beans.factory.config.BeanDefinition;
|
||||
import org.springframework.context.annotation.Scope;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -36,4 +40,13 @@ public class OrderElementTemplateDAO extends
|
|||
GenericDAOHibernate<OrderElementTemplate, Long> implements
|
||||
IOrderElementTemplateDAO {
|
||||
|
||||
@Override
|
||||
@Transactional(readOnly = true)
|
||||
@SuppressWarnings("unchecked")
|
||||
public List<OrderElementTemplate> getRootTemplates() {
|
||||
Query query = getSession().createQuery(
|
||||
"select t from OrderElementTemplate t where t.parent = NULL");
|
||||
return query.list();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ import org.navalplanner.business.templates.entities.OrderElementTemplate;
|
|||
*/
|
||||
public interface IOrderTemplatesModel {
|
||||
|
||||
List<OrderElementTemplate> getTemplates();
|
||||
List<OrderElementTemplate> getRootTemplates();
|
||||
|
||||
void createTemplateFrom(OrderElement orderElement);
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ public class OrderTemplatesController extends GenericForwardComposer implements
|
|||
private IURLHandlerRegistry handlerRegistry;
|
||||
|
||||
public List<OrderElementTemplate> getTemplates() {
|
||||
return model.getTemplates();
|
||||
return model.getRootTemplates();
|
||||
}
|
||||
|
||||
private OnlyOneVisible getVisibility() {
|
||||
|
|
|
|||
|
|
@ -53,8 +53,8 @@ public class OrderTemplatesModel implements IOrderTemplatesModel {
|
|||
private OrderElementTemplate template;
|
||||
|
||||
@Override
|
||||
public List<OrderElementTemplate> getTemplates() {
|
||||
return dao.list(OrderElementTemplate.class);
|
||||
public List<OrderElementTemplate> getRootTemplates() {
|
||||
return dao.getRootTemplates();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue