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

fixed upload file 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@82291 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2013-10-02 15:16:10 +00:00
parent 1566ad12ad
commit 3574960c4e
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@ -84,7 +84,7 @@
<artifactId>usermanagement-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.portal</groupId>
<artifactId>custom-portal-handler</artifactId>
@ -171,12 +171,6 @@
<artifactId>aslsocial</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.dvos</groupId>
<artifactId>usermanagement-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>workspace-application-handler</artifactId>

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

@ -1574,7 +1574,7 @@ public class GWTWorkspaceBuilder {
List<InfoContactModel> listContactsModel = new ArrayList<InfoContactModel>();
logger.trace("Building list contact model list user model");
for (UserModel userModel : listUsers) {
String fullName = UserUtil.getUserFullName(userModel.getFullname());
@ -1583,7 +1583,7 @@ public class GWTWorkspaceBuilder {
else
logger.trace("buildGXTListContactsModel doesn't return user: "+userModel.getScreenName()+ "because name is null or empty");
}
logger.trace("List contact model completed, return " +listContactsModel.size()+" contacts");
// for(User user: listUsers){
// String fullName = UserUtil.getUserFullName(user.getPortalLogin());
//

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

@ -1260,10 +1260,12 @@ public class GWTWorkspaceServiceImpl extends RemoteServiceServlet implements GWT
}
UserManager userManag = new LiferayUserManager();
workspaceLogger.trace("user manager getting list users...");
return builder.buildGXTListContactsModel(userManag.listUsers());
} catch (Exception e) {
workspaceLogger.error("Error in server get all contacts ", e);
// return new ArrayList<InfoContactModel>();
throw new Exception(e.getMessage());
}
}

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

@ -54,10 +54,10 @@ public class WsUtil {
// public static final String TEST_USER = "federico.defaveri";
// public static final String TEST_USER = "massimiliano.assante";
// public static final String TEST_USER = "pasquale.pagano";
public static final String TEST_USER = "francesco.mangiacrapa";
// public static final String TEST_USER = "francesco.mangiacrapa";
// public static final String TEST_USER_FULL_NAME = "Francesco Mangiacrapa";
// public static final String TEST_USER = "aureliano.gentile";
// public static final String TEST_USER = "test.user";
public static final String TEST_USER = "test.user";
// public static final String TEST_USER = "antonio.gioia";
public static final String TEST_USER_FULL_NAME = "Test User";