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

Browse Source
This commit is contained in:
Maxime Dagnicourt
2008-02-24 22:23:35 +00:00
parent f0fb3887fa
commit 461fcf7793
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,7 @@
<script type='text/javascript' src='./dwr/util.js'></script> <script type='text/javascript' src='./dwr/util.js'></script>
<script type='text/javascript' src='./dwr/interface/DelegateArticlesJS.js'></script> <script type='text/javascript' src='./dwr/interface/DelegateArticlesJS.js'></script>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[
var selectedArticleId; var selectedArticleId;
var articleId; var articleId;
var pattern; var pattern;
@@ -91,17 +91,8 @@
function removeRemote() { function removeRemote() {
var itemsToRemove = $('refereesList'+articleId).select('div.selected'); var itemsToRemove = $('refereesList'+articleId).select('div.selected');
<<<<<<< .mine
var refereesId = itemsToRemove.pluck('id'); var refereesId = itemsToRemove.pluck('id');
=======
var refereeId = itemsToRemove.pluck('id');
>>>>>>> .r446
//var articleId = $('articleId').value;
<<<<<<< .mine
DelegateArticlesJS.removeReferees(refereesId, articleId, remove); DelegateArticlesJS.removeReferees(refereesId, articleId, remove);
=======
DelegateArticlesJS.removeReferee(refereeId, articleId, remove);
>>>>>>> .r446
} }
function remove() { function remove() {
@@ -122,13 +113,8 @@
function addRemote(){ function addRemote(){
var itemsToAdd = $('refereesList'+articleId).select('div.selected'); var itemsToAdd = $('refereesList'+articleId).select('div.selected');
var refereesId = itemsToAdd.pluck('id'); var refereesId = itemsToAdd.pluck('id');
//var articleId = $('articleId').value;
<<<<<<< .mine
DelegateArticlesJS.addReferees(refereesId, articleId, add()); DelegateArticlesJS.addReferees(refereesId, articleId, add());
=======
DelegateArticlesJS.addReferee(refereeId, articleId, add());
>>>>>>> .r446
} }
function add() { function add() {
@@ -151,8 +137,7 @@
itemsToRemove.invoke('remove'); itemsToRemove.invoke('remove');
itemsToRemove = $('refereesList'+artId).select('div.dynamicListItem'); itemsToRemove = $('refereesList'+artId).select('div.dynamicListItem');
itemsToRemove.invoke('remove'); itemsToRemove.invoke('remove');
} }
//]]>
</script> </script>
</head> </head>

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

@@ -145,7 +145,7 @@ public List<RefereeBean> getRefereesWithTheArticle(int articleId ){
public void addReferees(List<String> refereesId,int articleId){ public void addReferees(List<String> refereesId,int articleId){
for (String refereeId : refereesId) { for (String refereeId : refereesId) {
articleManager.delegateArticleToReferee(articleId, refereeId,memberId); articleManager.delegateArticleToReferee(articleId, refereeId,memberId);
conferenceManager.addRole(RoleType.REFEREE, refereeId, SessionService.getInstance().getCurrentConference().getId()); conferenceManager.addRole(RoleType.REFEREE, refereeId, conf.getId());
} }
logger.debug("add referee to article"); logger.debug("add referee to article");
} }
@@ -154,8 +154,13 @@ public List<RefereeBean> getRefereesWithTheArticle(int articleId ){
for (String refereeId : refereesId) { for (String refereeId : refereesId) {
articleManager.undelegateArticleToReferee(articleId, refereeId, memberId); articleManager.undelegateArticleToReferee(articleId, refereeId, memberId);
User referee = userManager.getUser(refereeId); User referee = userManager.getUser(refereeId);
Role role = new Role(RoleType.REFEREE,referee,SessionService.getInstance().getCurrentConference()); List<Role> userRoles = conferenceManager.getRoles(referee.getLogin(), conf.getId());
conferenceManager.removeRole(role); for (Role role : userRoles) {
if(role.getType().equals(Role.RoleType.REFEREE)){
conferenceManager.removeRole(role);
}
}
} }
logger.debug("remove members to article"); logger.debug("remove members to article");