Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1198 → Rev 1200

/impl/conf/WEB-INF/struts/tiles-courseunits.xml
193,7 → 193,7
<put name="body" value="/admin/courseunits/courseunit.jsp"/>
</definition>
<definition name="page.edit.courseunit.admin.from.course.course.units" extends="base.separators.home">
<definition name="page.edit.courseunit.admin.from.course.course.units" extends="page.separators.home">
<put name="title" value="Unidade Curricular"/>
<put name="topnav" value="/admin/courseunits/topnavEditCourseUnitFromCourseCourseUnits.jsp"/>
<put name="body" value="/admin/courseunits/courseunit.jsp"/>
/impl/src/java/pt/estgp/estgweb/domain/dao/impl/UserDaoImpl.java
14,6 → 14,7
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
 
import static org.hibernate.criterion.Restrictions.*;
136,7 → 137,14
{
if(role == null || role.trim().length() == 0)
return new ArrayList<User>();
return createCriteria().add(like("roles", "%" + role + "%")).addOrder(Order.asc("name")).list();
List<User> users = createCriteria().add(like("roles", "%" + role + "%")).addOrder(Order.asc("name")).list();
Iterator<User> iter = users.iterator();
while(iter.hasNext())
{
User u = iter.next();
if(!u.hasRole(role))
iter.remove();
}
}
 
public List<User> loadRoleAreaUsers(String role, String area)