diff --git a/pom.xml b/pom.xml index e3bd4f9..9a95bbf 100644 --- a/pom.xml +++ b/pom.xml @@ -158,6 +158,11 @@ 4.11 test + + org.gcube.portlets.user + gcube-widgets + compile + diff --git a/src/main/java/org/gcube/portlets/admin/createusers/client/CreateUsers.java b/src/main/java/org/gcube/portlets/admin/createusers/client/CreateUsers.java index 9c2c658..85ce5f6 100644 --- a/src/main/java/org/gcube/portlets/admin/createusers/client/CreateUsers.java +++ b/src/main/java/org/gcube/portlets/admin/createusers/client/CreateUsers.java @@ -1,6 +1,10 @@ package org.gcube.portlets.admin.createusers.client; +import org.gcube.portlets.user.gcubewidgets.client.ClientScopeHelper; + import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.user.client.Window.Location; +import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.RootPanel; @@ -13,7 +17,14 @@ public class CreateUsers implements EntryPoint { @Override public void onModuleLoad() { - RootPanel.get("create-users-container").add(new CreateUsersPanel()); - + ClientScopeHelper.getService().setScope(Location.getHref(), new AsyncCallback() { + @Override + public void onSuccess(Boolean result) { + RootPanel.get("create-users-container").add(new CreateUsersPanel()); + } + @Override + public void onFailure(Throwable caught) { + } + }); } } \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/admin/createusers/client/ui/RegisteredUsersTable.java b/src/main/java/org/gcube/portlets/admin/createusers/client/ui/RegisteredUsersTable.java index fa210e8..009bdd1 100644 --- a/src/main/java/org/gcube/portlets/admin/createusers/client/ui/RegisteredUsersTable.java +++ b/src/main/java/org/gcube/portlets/admin/createusers/client/ui/RegisteredUsersTable.java @@ -18,6 +18,7 @@ import com.google.gwt.dom.client.EventTarget; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.event.shared.HandlerManager; import com.google.gwt.i18n.client.DateTimeFormat; +import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat; import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.user.cellview.client.Column; import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler; @@ -168,7 +169,7 @@ public class RegisteredUsersTable extends Composite { Column registrationDate = getColumn(new TextCell(), new GetValue() { @Override public String getValue(VreUserBean user) { - return DateTimeFormat.getShortDateFormat().format(new Date(user.getRegisrationDate())); + return DateTimeFormat.getFormat(PredefinedFormat.DATE_SHORT).format(new Date(user.getRegisrationDate())); } }); diff --git a/src/main/resources/org/gcube/portlets/admin/createusers/CreateUsers.gwt.xml b/src/main/resources/org/gcube/portlets/admin/createusers/CreateUsers.gwt.xml index e2598b2..37ade76 100644 --- a/src/main/resources/org/gcube/portlets/admin/createusers/CreateUsers.gwt.xml +++ b/src/main/resources/org/gcube/portlets/admin/createusers/CreateUsers.gwt.xml @@ -6,10 +6,10 @@ + - + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 2b597fe..77381a0 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -5,20 +5,28 @@ - - - servlet - org.gcube.portlets.admin.createusers.server.CreateUsersImpl - + + + servlet + org.gcube.portlets.admin.createusers.server.CreateUsersImpl + + + scopeService + org.gcube.portlets.user.gcubewidgets.server.ScopeServiceImpl + - - servlet - /createusers/usersservice - + + servlet + /createusers/usersservice + + + scopeService + /createusers/scopeService + - - - CreateUsers.html - + + + CreateUsers.html +