From 5031c3b9c0382029ca0b9c5f78510bd4611f71ff Mon Sep 17 00:00:00 2001 From: "francesco.mangiacrapa" Date: Fri, 23 Feb 2024 15:27:14 +0100 Subject: [PATCH] Revisited the NavBar. Updated CSS --- .../client/CKanPublisherService.java | 4 ++-- .../public/CKanMetadataPublisher.css | 6 ++++++ .../server/CKANPublisherServicesImpl.java | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanPublisherService.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanPublisherService.java index 8debf1e..783b9dd 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanPublisherService.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/client/CKanPublisherService.java @@ -104,7 +104,7 @@ public interface CKanPublisherService extends RemoteService { * @return true if he/she can publish, false otherwise * @throws Exception the exception */ - boolean isPublisherUser() throws Exception; + Boolean isPublisherUser() throws Exception; /** * Get the list of vocabulary tags for this scope. @@ -131,7 +131,7 @@ public interface CKanPublisherService extends RemoteService { * @return true, if is owner or admin user * @throws Exception the exception */ - boolean isPublisherOwnerOrAdminUser(String datasetIdOrName) throws Exception; + Boolean isPublisherOwnerOrAdminUser(String datasetIdOrName) throws Exception; /** * Gets the dataset bean for update. diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/public/CKanMetadataPublisher.css b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/public/CKanMetadataPublisher.css index 29d2735..be2e4a6 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/public/CKanMetadataPublisher.css +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/public/CKanMetadataPublisher.css @@ -181,4 +181,10 @@ height: 22px !important; padding: 0px !important; margin: 0px !important; +} + +#the_catalogue_nav_bar .btn.disabled { + /*background-color: #E6E6E6;*/ + text-decoration: none !important; + color: #333333 !important; } \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java index 1fa556e..9eb5e71 100644 --- a/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java +++ b/src/main/java/org/gcube/portlets/widgets/ckandatapublisherwidget/server/CKANPublisherServicesImpl.java @@ -1181,7 +1181,7 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C * @throws Exception the exception */ @Override - public boolean isPublisherUser() throws Exception { + public Boolean isPublisherUser() throws Exception { String username = GenericUtils.getCurrentUser(getThreadLocalRequest()).getUsername(); logger.info("Checking if the user " + username + " can publish or not on the catalogue"); @@ -1265,7 +1265,7 @@ public class CKANPublisherServicesImpl extends RemoteServiceServlet implements C * @throws Exception the exception */ @Override - public boolean isPublisherOwnerOrAdminUser(String datasetIdOrName) throws Exception { + public Boolean isPublisherOwnerOrAdminUser(String datasetIdOrName) throws Exception { String username = GenericUtils.getCurrentUser(getThreadLocalRequest()).getUsername(); logger.info("Checking if the user " + username + " can publish or not on the catalogue");