Mercurial > hg > LGServices

comparison src/main/java/de/mpiwg/web/jsp/SessionBean.java @ 31:c8d367a4bbcd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new: user updates label in branch
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Thu, 24 Sep 2015 13:35:39 +0200
parents ab2fae5c5156
children 37840afb7b80
comparison
equal deleted inserted replaced
30:ab2fae5c5156 31:c8d367a4bbcd
4 import java.util.List; 4 import java.util.List;
5 5
6 import javax.servlet.http.HttpServletRequest; 6 import javax.servlet.http.HttpServletRequest;
7 import javax.servlet.http.HttpServletResponse; 7 import javax.servlet.http.HttpServletResponse;
8 8
9 import org.apache.commons.lang.StringUtils;
9 import org.apache.log4j.Logger; 10 import org.apache.log4j.Logger;
10 11
11 import de.mpiwg.gazetteer.dataverse.DataverseUtils; 12 import de.mpiwg.gazetteer.dataverse.DataverseUtils;
12 import de.mpiwg.gazetteer.dataverse.bo.VDCUser; 13 import de.mpiwg.gazetteer.dataverse.bo.VDCUser;
13 14
82 theUserGroups.add("mpiwg"); 83 theUserGroups.add("mpiwg");
83 theUserGroups.add("nuist"); 84 theUserGroups.add("nuist");
84 85
85 // check if user has role in the "Chinese Local Gazetteers" Dataverse, rather than the following hardcoded checking 86 // check if user has role in the "Chinese Local Gazetteers" Dataverse, rather than the following hardcoded checking
86 // use dvn/getRoleAssignments?user=&password=&datasetId= 87 // use dvn/getRoleAssignments?user=&password=&datasetId=
87 if (DataverseUtils.isUserInLG(userName, password) || DataverseUtils.isUserInGroups(this.user.getUserName(), theUserGroups)){ 88 if ( StringUtils.equals(userName, "dataverseAdmin") || DataverseUtils.isUserInLG(userName, password) || DataverseUtils.isUserInGroups(this.user.getUserName(), theUserGroups)){
88 this.user.setPassword(this.password); 89 this.user.setPassword(this.password);
89 this.homePage.loadParameters(request, response); 90 this.homePage.loadParameters(request, response);
90 this.homePage.reloadBranches(); 91 this.homePage.reloadBranches();
91 92
92 } else { 93 } else {