Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 721 → Rev 722

/impl/conf/log4j.properties
21,12 → 21,12
log4j.appender.hibernate.loggingEventClass=LogEvent
 
# suppress warnings from the SessionImpl (like Narrowing proxy to class com.atlassian.confluence.pages.Page - this operation breaks ==)
log4j.logger.org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog=ERROR
log4j.logger.org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog=FATAL
log4j.additivity.org.hibernate.engine.StatefulPersistenceContext.ProxyWarnLog=false
 
 
#default category
log4j.rootLogger = warn, defaultLog, stdout
log4j.rootLogger = info, defaultLog, stdout
 
### enable the following line if you want to track down connection ###
### leakages when using DriverManagerConnectionProvider ###
/impl/conf/ldap.properties
1,6 → 1,6
#LDAP Authentication
 
ldap.host=donald.estgp.pt
ldap.host=srvdonald
ldap.port=389
ldap.base.queries=DC=ipp,DC=pt
##Put here a User that can perform queries to Ldap
/impl/src/java/pt/estgp/estgweb/services/courseunits/DirectedCoordinatedUnitsService.java
99,7 → 99,8
}
/**
* If is a student can see only his course
*/
// ALTERACAO PARA TODOS VEREM TODOS OS PROGRAMAS
 
if (userSession.getUser() != null && userSession.getUser() instanceof Student)
{
StudentImpl sigesUser = (StudentImpl) userSession.getUser();
109,9 → 110,11
courseId = course.getId();
}
}
*/
 
List<Course> courses;
 
 
if(courseId > 0)
{
courses = new ArrayList<Course>();
/impl/src/java/pt/estgp/estgweb/domain/views/CourseUnitAssignementView.java
267,7 → 267,12
 
public boolean canDeliver(HttpServletRequest request)
{
 
UserSession userSession = UserSessionProxy.loadUserSessionFromRequest(request);
 
 
if( courseUnitAssignement.getDeliverDate() == null)
return false;
return
userSession.getUser() != null &&
((UserImpl) userSession.getUser()).isInCourseUnit(courseUnitId) &&
/impl/src/web/user/courses/directedCoordinatedCourses.jsp
78,7 → 78,8
</html:select>
</td>
</tr>
<baco:hasRole role="admin,all,services,teacher,servicesPrograms,administrativeCouncil,courseCoordinator,courseDirector,scientificCouncil,pedagogicCouncil">
<!--ALTERACAO PARA TODOS VEREM TODOS PROGRAMAS-->
<!-- <baco:hasRole role="admin,all,services,teacher,servicesPrograms,administrativeCouncil,courseCoordinator,courseDirector,scientificCouncil,pedagogicCouncil">-->
<tr>
<th><bean:message key="departamento"/></th>
<td>
111,7 → 112,7
</html:select>
</td>
</tr>
</baco:hasRole>
<!--</baco:hasRole>-->
</table>
</div>
 
386,4 → 387,4
</table>
 
 
</html:form>
</html:form>