inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
106641: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) (PARTIAL MERGE)
      106597: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
         106541: Merged /NESS/5.0.2-2015_06_03 (5.0.2) to URL: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.0.2 (..)
            106485: MNT-12138 : ENH - Share must always offer the Download option
               - Added new Download button in Quick share screen available only for images
               - Added "nodeRef" on metadata response from api called by quickshare to avoid a call to a second api


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@106655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-06-21 08:25:20 +00:00
parent 557ce129d7
commit 042003a1cd
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

@@ -343,6 +343,7 @@ public class QuickShareServiceImpl implements QuickShareService, NodeServicePoli
Map<String, Object> metadata = new HashMap<String, Object>(8); Map<String, Object> metadata = new HashMap<String, Object>(8);
metadata.put("nodeRef", nodeRef.toString());
metadata.put("name", nodeProps.get(ContentModel.PROP_NAME)); metadata.put("name", nodeProps.get(ContentModel.PROP_NAME));
metadata.put("title", nodeProps.get(ContentModel.PROP_TITLE)); metadata.put("title", nodeProps.get(ContentModel.PROP_TITLE));
@@ -401,7 +402,7 @@ public class QuickShareServiceImpl implements QuickShareService, NodeServicePoli
metadata.put("sharable", sharable); metadata.put("sharable", sharable);
} }
Map<String, Object> model = new HashMap<String, Object>(1); Map<String, Object> model = new HashMap<String, Object>(2);
model.put("item", metadata); model.put("item", metadata);
return model; return model;
} }
@@ -451,6 +452,7 @@ public class QuickShareServiceImpl implements QuickShareService, NodeServicePoli
{ {
logger.debug("QuickShare - retrieved metadata: "+sharedId+" ["+nodeRef+"]["+model+"]"); logger.debug("QuickShare - retrieved metadata: "+sharedId+" ["+nodeRef+"]["+model+"]");
} }
//model.put("nodeRef", nodeRef)
return model; return model;
} }