gCubeSystem
/
workspace-tree-widget
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed full name to group 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@92908 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2014-03-10 17:47:49 +00:00
parent 44830c6da2
commit c3ea887532
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/gcube/portlets/user/workspace/client/view/sharing/multisuggest/MultiDragContact.java
View File

@ -317,24 +317,24 @@ public class MultiDragContact extends Dialog {
public void addTargetContacts(List<InfoContactModel> listContact){
if(listContact!=null && listContact.size()>0){
storeTarget.add(convetFromInfoContactModel(listContact));
storeTarget.add(convertFromInfoContactModel(listContact));
}
}
private List<ExtendedInfoContactModel> convetFromInfoContactModel(List<InfoContactModel> listContact){
private List<ExtendedInfoContactModel> convertFromInfoContactModel(List<InfoContactModel> listContact){
if(listContact!=null){
List<ExtendedInfoContactModel> listExtended = new ArrayList<ExtendedInfoContactModel>(listContact.size());
//SETTING ICONS
for (InfoContactModel infoContactModel : listContact) {
listExtended.add(convetFromInfoContactModel(infoContactModel));
listExtended.add(convertFromInfoContactModel(infoContactModel));
}
return listExtended;
}
return new ArrayList<ExtendedInfoContactModel>();
}
private ExtendedInfoContactModel convetFromInfoContactModel(InfoContactModel infoContactModel){
private ExtendedInfoContactModel convertFromInfoContactModel(InfoContactModel infoContactModel){
if(infoContactModel!=null){
String fullName = infoContactModel.getName();
if(fullName==null || fullName.isEmpty())
@ -349,7 +349,7 @@ public class MultiDragContact extends Dialog {
public void addTargetContact(InfoContactModel contact){
if(contact!=null)
storeTarget.add(convetFromInfoContactModel(contact));
storeTarget.add(convertFromInfoContactModel(contact));
}
public List<InfoContactModel> getTargetListContact(){

1
src/main/java/org/gcube/portlets/user/workspace/server/GWTWorkspaceBuilder.java
View File

@ -144,6 +144,7 @@ public class GWTWorkspaceBuilder {
hashTestUser.put(WsUtil.TEST_USER.toString(), new InfoContactModel(WsUtil.TEST_USER, WsUtil.TEST_USER, WsUtil.TEST_USER_FULL_NAME,false));
hashTestUser.put("francesco.mangiacrapa", new InfoContactModel("francesco.mangiacrapa", "francesco.mangiacrapa", "Francesco Mangiacrapa",false));
hashTestUser.put("massimiliano.assante", new InfoContactModel("massimiliano.assante", "massimiliano.assante", "Massimiliano Assante",false));
hashTestUser.put("gcube-test-test", new InfoContactModel("gcube-test-test", "gcube-test-test", "gcube-test-test",true));
}

4
src/main/java/org/gcube/portlets/user/workspace/server/util/UserUtil.java
View File

@ -68,8 +68,8 @@ public class UserUtil {
return WsUtil.TEST_USER_FULL_NAME;
}
logger.trace("Return empty full name for: "+portalLogin);
return "";
logger.trace("Return portal login as full name for: "+portalLogin);
return portalLogin;
}
public static List<String> getListLoginByInfoContactModel(List<InfoContactModel> listContacts){

2
src/main/java/org/gcube/portlets/user/workspace/server/util/WsUtil.java
View File

@ -113,7 +113,7 @@ public class WsUtil {
// }else if(user.compareToIgnoreCase("francesco.mangiacrapa")==0){
//
// withoutPortal = true;
//// END UNCOMMENT
// END UNCOMMENT
}else{
withoutPortal = false;