updated to user full names
git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/vre-definition@82388 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
6595ab7d3b
commit
fbcf5d3ed6
|
@ -271,8 +271,9 @@ public class VREDefinitionServiceImpl extends RemoteServiceServlet implements VR
|
|||
return getFakeBelongingUsers();
|
||||
}
|
||||
else {
|
||||
UserManager um = null;
|
||||
try {
|
||||
UserManager um = new LiferayUserManager();
|
||||
um = new LiferayUserManager();
|
||||
long currOrgid = getASLSession().getGroupId();
|
||||
RoleManager rm = new LiferayRoleManager();
|
||||
|
||||
|
@ -301,7 +302,7 @@ public class VREDefinitionServiceImpl extends RemoteServiceServlet implements VR
|
|||
try {
|
||||
ArrayList<String> managers = new ArrayList<String>();
|
||||
for (int i = 0; i < belongingUsers.size(); i++) {
|
||||
managers.add(belongingUsers.get(i).getScreenName());
|
||||
managers.add(belongingUsers.get(i).getFullname()+" ("+belongingUsers.get(i).getScreenName()+")");
|
||||
}
|
||||
toReturn.put("Manager", managers);
|
||||
|
||||
|
@ -312,10 +313,12 @@ public class VREDefinitionServiceImpl extends RemoteServiceServlet implements VR
|
|||
" There must be at least one.");
|
||||
|
||||
}
|
||||
|
||||
toReturn.put("Designer", username);
|
||||
|
||||
try {
|
||||
|
||||
String fullName = um.getUserByScreenName(username).getFullname();
|
||||
toReturn.put("Designer", fullName+" ("+username+")");
|
||||
|
||||
|
||||
VREDescriptionBean vre = getVREInSession();
|
||||
if(vre!= null) {
|
||||
toReturn.put("vreName",vre.getName());
|
||||
|
@ -326,7 +329,7 @@ public class VREDefinitionServiceImpl extends RemoteServiceServlet implements VR
|
|||
toReturn.put("vreEndTime",vre.getEndTime());
|
||||
}
|
||||
} catch (Exception e){
|
||||
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -339,12 +342,12 @@ public class VREDefinitionServiceImpl extends RemoteServiceServlet implements VR
|
|||
|
||||
ArrayList<String> managers = new ArrayList<String>();
|
||||
|
||||
managers.add("antonio.gioia");
|
||||
managers.add("andrea.manzi");
|
||||
managers.add("massimiliano.assante");
|
||||
managers.add("Pasquale Pagano (pasquale.pagano)");
|
||||
managers.add("Andrea Manzi (andrea.manzi)");
|
||||
managers.add("Massimiliano Assante (massimiliano.assante)");
|
||||
ret.put("Manager",managers);
|
||||
|
||||
ret.put("Designer", "antonio.gioia");
|
||||
ret.put("Designer", "Leanoardo Candela (leonardo.candela)");
|
||||
try {
|
||||
VREDescriptionBean vre = getVREInSession();
|
||||
if(vre!= null) {
|
||||
|
@ -361,10 +364,19 @@ public class VREDefinitionServiceImpl extends RemoteServiceServlet implements VR
|
|||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
private String extractUserName(String toExtract) {
|
||||
int openBracket = toExtract.indexOf("(")+1;
|
||||
int closeBracket = toExtract.indexOf(")");
|
||||
return toExtract.substring(openBracket, closeBracket);
|
||||
}
|
||||
|
||||
public String setVRE(VREDescriptionBean bean, String[] functionalityIDs, HashMap<String, List<ExternalResourceModel>> funcToExternalResources)
|
||||
throws VREDefinitionException {
|
||||
|
||||
bean.setDesigner(extractUserName(bean.getDesigner()));
|
||||
bean.setManager(extractUserName(bean.getManager()));
|
||||
|
||||
setVREDescription(bean);
|
||||
setFunctionality(functionalityIDs, funcToExternalResources);
|
||||
try {
|
||||
|
|
Loading…
Reference in New Issue