Rev 1547 | Rev 1692 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1547 | Rev 1585 | ||
---|---|---|---|
Line 28... | Line 28... | ||
28 | return getId(); |
28 | return getId(); |
29 | } |
29 | } |
30 | 30 | ||
31 | public boolean isFromCourseCommission(UserSession userSession) |
31 | public boolean isFromCourseCommission(UserSession userSession) |
32 | { |
32 | { |
- | 33 | return isFromCourseCommission(userSession.getUser()); |
|
- | 34 | } |
|
- | 35 | ||
- | 36 | public boolean isFromCourseCommission(User user) |
|
- | 37 | { |
|
33 | return userSession.getUser()!= null && |
38 | return user != null && |
- | 39 | ( |
|
34 | userSession.getUser().hasRole(getValidationRole()); |
40 | user.hasRole(getValidationRole()) |
- | 41 | || |
|
- | 42 | (getDirector() != null && user.getId() == getDirector().getId()) |
|
- | 43 | || |
|
- | 44 | (getCoordinator() != null && user.getId() == getCoordinator().getId())); |
|
35 | } |
45 | } |
36 | 46 | ||
37 | public 1.5.0/docs/api/java/lang/String.html">String getDegreeForJsonApi() |
47 | public 1.5.0/docs/api/java/lang/String.html">String getDegreeForJsonApi() |
38 | { |
48 | { |
39 | return ConfigProperties.getProperty("course." + getDegree()); |
49 | return ConfigProperties.getProperty("course." + getDegree()); |