inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
68123: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      67232: MNT-10361: Merged DEV to V4.2-BUG-FIX (4.2.3)
         67146: MNT-10361 Disabling QuickShare throws exception and previewer fails to load
              - Moved the call to checkEnabled(); from QuickShareServiceImpl.getMetaData(NodeRef nodeRef) in QuickShareServiceImpl.getMetaData(String shareId). 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68408 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2014-04-30 16:09:58 +00:00
parent cf5e452e77
commit ac16cb40ab
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/quickshare/QuickShareServiceImpl.java
View File

@@ -262,7 +262,7 @@ public class QuickShareServiceImpl implements QuickShareService, NodeServicePoli
@Override @Override
public Map<String, Object> getMetaData(NodeRef nodeRef) public Map<String, Object> getMetaData(NodeRef nodeRef)
{ {
checkEnabled(); // TODO This functionality MUST be available when quickshare is also disabled, therefor refactor it out from the quickshare package to a more common package.
Map<QName, Serializable> nodeProps = nodeService.getProperties(nodeRef); Map<QName, Serializable> nodeProps = nodeService.getProperties(nodeRef);
ContentData contentData = (ContentData)nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT); ContentData contentData = (ContentData)nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT);
@@ -379,6 +379,8 @@ public class QuickShareServiceImpl implements QuickShareService, NodeServicePoli
@Override @Override
public Map<String, Object> getMetaData(String sharedId) public Map<String, Object> getMetaData(String sharedId)
{ {
checkEnabled();
Pair<String, NodeRef> pair = getTenantNodeRefFromSharedId(sharedId); Pair<String, NodeRef> pair = getTenantNodeRefFromSharedId(sharedId);
final String tenantDomain = pair.getFirst(); final String tenantDomain = pair.getFirst();
final NodeRef nodeRef = pair.getSecond(); final NodeRef nodeRef = pair.getSecond();