diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogService.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogService.java index c967522..0ae0a7f 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogService.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogService.java @@ -79,4 +79,9 @@ public interface GcubeCkanDataCatalogService extends RemoteService { * @return */ boolean isManageProductEnabled(); + + /** + * Check if the management panels but publish/share link must be removed + */ + boolean isViewPerVREEnabled(); } diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogServiceAsync.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogServiceAsync.java index 9892a37..009d448 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogServiceAsync.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/GcubeCkanDataCatalogServiceAsync.java @@ -84,4 +84,6 @@ public interface GcubeCkanDataCatalogServiceAsync { * @return */ void isManageProductEnabled(AsyncCallback callback); + + void isViewPerVREEnabled(AsyncCallback callback); } diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/CkanMetadataManagementPanel.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/CkanMetadataManagementPanel.java index 0ad9de1..6e4ffa5 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/CkanMetadataManagementPanel.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/CkanMetadataManagementPanel.java @@ -344,4 +344,21 @@ public class CkanMetadataManagementPanel extends FlowPanel{ manageProduct.setVisible(false); } + + public void removeGenericManagementButtons() { + + home.setVisible(false); + organizations.setVisible(false); + groups.setVisible(false); + items.setVisible(false); + types.setVisible(false); + separatorMyInfo.setVisible(false); + separatorAdminButtons.setVisible(false); + myDatasets.setVisible(false); + myOrganizations.setVisible(false); + myGroups.setVisible(false); + statistics.setVisible(false); + manageProduct.setVisible(false); + + } } diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java index c07df93..bf5edd0 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/client/view/GCubeCkanDataCatalogPanel.java @@ -149,7 +149,28 @@ public class GCubeCkanDataCatalogPanel extends BaseViewTemplate { } }); - + + // check if management buttons need to be removed + GCubeCkanDataCatalog.service.isViewPerVREEnabled(new AsyncCallback() { + + @Override + public void onSuccess(Boolean result) { + + if(result){ + // hide all management buttons + managementPanel.removeGenericManagementButtons(); + } + + } + + @Override + public void onFailure(Throwable caught) { + + + + } + }); + // retrieve organizations GCubeCkanDataCatalog.service.getCkanOrganizationsNamesAndUrlsForUser(new AsyncCallback>() { diff --git a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java index dcbd2ca..cbb75b0 100644 --- a/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java +++ b/src/main/java/org/gcube/portlets/gcubeckan/gcubeckandatacatalog/server/GcubeCkanDataCatalogServiceImpl.java @@ -93,7 +93,7 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem } if(pathInfoParameter == null || pathInfoParameter.isEmpty()){ - boolean viewEnabled = viewPerOrganizationEnabled(); + boolean viewEnabled = isViewPerVREEnabled(); if(viewEnabled){ GroupManager gm = new LiferayGroupManager(); String groupName = gm.getGroup(gm.getGroupIdFromInfrastructureScope(scopePerCurrentUrl)).getGroupName().toLowerCase(); @@ -555,7 +555,8 @@ public class GcubeCkanDataCatalogServiceImpl extends RemoteServiceServlet implem * Ask to liferay * @return */ - public boolean viewPerOrganizationEnabled(){ + @Override + public boolean isViewPerVREEnabled(){ boolean enabled = false; String scopePerCurrentUrl = SessionUtil.getScopeFromClientUrl(getThreadLocalRequest());