christiancorsano/yacos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Policy failures:

Browse Source 
Code warning
- failed on resource DelegateArticleController.java. Reason: The import org.yacos.core.users.Role is never used, line 1
Override reason:   
z
This commit is contained in:
Maxime Dagnicourt
2008-02-24 23:54:34 +00:00
parent 4a92919a08
commit fe82e87ab7
2 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp
View File

@@ -90,7 +90,7 @@
}
function removeRemote() {
var itemsToRemove = $('refereesList'+articleId).select('div.selected');
var itemsToRemove = $('refereesArticleList'+articleId).select('div.selected');
var refereesId = itemsToRemove.pluck('id');
DelegateArticlesJS.removeReferees(refereesId, articleId, remove);
}

29
YACOSWeb/src/org/yacos/web/PCmember/controller/DelegateArticleController.java
View File

@@ -124,15 +124,11 @@ public List<RefereeBean> getRefereesWithTheArticle(int articleId ){
spectialities.add(speciality.getName());
}
member.setSpecialities(spectialities);
List<Role> userRoles = conferenceManager.getRoles(user.getLogin(), conf.getId());
boolean isMember = false;
for (Role role : userRoles) {
if(role.getType().equals(Role.RoleType.CHAIRMAN)||(role.getType().equals(Role.RoleType.PCMEMBER))){
isMember = true;
}
}
//add the member to the return list
if (!refereesTmp.contains(user) && !isMember){
if (!refereesTmp.contains(user)
&& !userManager.hasRoleForConference(user.getLogin(), RoleType.CHAIRMAN, conf.getId())
&& !userManager.hasRoleForConference(user.getLogin(), RoleType.PCMEMBER, conf.getId())
){
members.add(member);
}
@@ -145,24 +141,19 @@ public List<RefereeBean> getRefereesWithTheArticle(int articleId ){
public void addReferees(List<String> refereesId,int articleId){
for (String refereeId : refereesId) {
articleManager.delegateArticleToReferee(articleId, refereeId,memberId);
if(!userManager.hasRoleForConference(refereeId, RoleType.REFEREE, conf.getId())){
conferenceManager.addRole(RoleType.REFEREE, refereeId, conf.getId());
}
logger.debug("add referee to article");
}
logger.info("add referee to article");
}
public void removeReferees(List<String> refereesId,int articleId){
for (String refereeId : refereesId) {
articleManager.undelegateArticleToReferee(articleId, refereeId, memberId);
User referee = userManager.getUser(refereeId);
List<Role> userRoles = conferenceManager.getRoles(referee.getLogin(), conf.getId());
for (Role role : userRoles) {
if(role.getType().equals(Role.RoleType.REFEREE)){
conferenceManager.removeRole(role);
}
}
}
logger.debug("remove members to article");
logger.info("remove members to article");
}
}