From cf5a52b9788ef00502047a8a032cbb7a86010d39 Mon Sep 17 00:00:00 2001 From: Cristian Turlica Date: Wed, 12 Oct 2016 05:14:58 +0000 Subject: [PATCH] REPO-1394: Discovery: merge back to 5.2.N (from feature branch) Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1) 130980 jkaabimofrad: REPO-224: API for retrieving detailed repository information. Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1) 131056 jkaabimofrad: REPO-224: Removed "transformationServerExpiresAt" attribute from the license JSON response as it is not part of AC. Merged WEBAPP-API (5.2.1) to 5.2.N (5.2.1) 131179 jkaabimofrad: REPO-224: Modified the license's entitlement response to always return "isClusterEnabled" and "isCryptodocEnabled". git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@131344 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/quickshare/QuickShareServiceImpl.java | 6 ++++++ .../service/cmr/quickshare/QuickShareService.java | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java b/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java index ad5aa3653f..a65c37409a 100644 --- a/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java +++ b/source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java @@ -886,6 +886,12 @@ public class QuickShareServiceImpl implements QuickShareService, return canDeleteSharedLink; } + @Override + public boolean isQuickShareEnabled() + { + return this.enabled; + } + private String getSiteName(NodeRef nodeRef) { NodeRef parent = nodeService.getPrimaryParent(nodeRef).getParentRef(); diff --git a/source/java/org/alfresco/service/cmr/quickshare/QuickShareService.java b/source/java/org/alfresco/service/cmr/quickshare/QuickShareService.java index daa6721dc2..df9ee0ae86 100644 --- a/source/java/org/alfresco/service/cmr/quickshare/QuickShareService.java +++ b/source/java/org/alfresco/service/cmr/quickshare/QuickShareService.java @@ -97,4 +97,12 @@ public interface QuickShareService * Determine if the current user has permission to delete the shared link. */ public boolean canDeleteSharedLink(NodeRef nodeRef, String sharedByUserId); + + /** + * Whether the quick share is enabled or not. + * + * @return true if quick share is enabled, false otherwise. + * @since 5.2 + */ + boolean isQuickShareEnabled(); }