From b028fcd4b470b49b09bcbbdebfbf034b17a70a2e Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Mon, 13 Dec 2021 11:27:03 +0100 Subject: [PATCH] Added "Logged in" role label --- .../client/GeoPortalDataEntryApp.java | 15 ++++++++++++--- .../client/ui/GeonaMainTabPanel.java | 8 ++++++++ .../client/ui/GeonaMainTabPanel.ui.xml | 2 ++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java index d6b3d04..e354a9e 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/GeoPortalDataEntryApp.java @@ -186,10 +186,19 @@ public class GeoPortalDataEntryApp implements EntryPoint { } catch (Exception e) { } - - initGUI(); + myRights = result; - + initGUI(); + GcubeUserRole userRole = myRights.getRoleRights().getUserRole(); + String msg = "Logged in as "; + if(userRole != null && userRole.getName()!=null) { + msg+= userRole.getName().substring(userRole.getName().indexOf("-")+1, userRole.getName().length()); + }else + msg+="Member"; + + mainTabPanel.setRoleLabel(msg); + + RoleRights roleRights = myRights.getRoleRights(); boolean canCreateNewItem = roleRights.getListPermessions().keySet().contains(ACTION_ON_ITEM.CREATE_NEW_PROJECT); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.java b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.java index df69f5f..462bfbd 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.java +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.java @@ -38,6 +38,7 @@ import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Composite; import com.google.gwt.user.client.ui.HTMLPanel; +import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; @@ -130,6 +131,9 @@ public class GeonaMainTabPanel extends Composite { @UiField Button resetSearch; + + @UiField + Label roleLabel; private HandlerManager appManagerBus; @@ -341,6 +345,10 @@ public class GeonaMainTabPanel extends Composite { }); } + + public void setRoleLabel(String msg) { + roleLabel.setText(msg); + } private void doSearchEvent() { String searchText = searchField.getText(); diff --git a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.ui.xml b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.ui.xml index 71adb1a..7f5e5ec 100644 --- a/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.ui.xml +++ b/src/main/java/org/gcube/portlets/user/geoportaldataentry/client/ui/GeonaMainTabPanel.ui.xml @@ -52,6 +52,8 @@ GNA +