diff --git a/src/main/java/org/gcube/portlets/admin/vredefinition/server/VREDefinitionServiceImpl.java b/src/main/java/org/gcube/portlets/admin/vredefinition/server/VREDefinitionServiceImpl.java index 93a2aab..7df8f8b 100644 --- a/src/main/java/org/gcube/portlets/admin/vredefinition/server/VREDefinitionServiceImpl.java +++ b/src/main/java/org/gcube/portlets/admin/vredefinition/server/VREDefinitionServiceImpl.java @@ -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 managers = new ArrayList(); 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 managers = new ArrayList(); - 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> funcToExternalResources) throws VREDefinitionException { + bean.setDesigner(extractUserName(bean.getDesigner())); + bean.setManager(extractUserName(bean.getManager())); + setVREDescription(bean); setFunctionality(functionalityIDs, funcToExternalResources); try {