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

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

Browse Source 
78865: Revert commit 76521 merged from V4.2-BUG-FIX: it was later reverted there, and is causing 2 failures in BlogServiceTest
      78779: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0) - mergeinfo had been lost and these 2 were never merged
         76521: Merged DEV to V4.2-BUG-FIX
            76328 : MNT-11854 : Consumer allowed to create Discussion, Wiki, Blog and Link if she/he creates the first item
             Add the changes - for discussion, blog and link containers we will get site permission.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82644 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 13:00:09 +00:00
parent 1fcc978177
commit 215fbfbd72
3 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/web/scripts/blogs/AbstractBlogWebScript.java
View File

@@ -243,10 +243,10 @@ public abstract class AbstractBlogWebScript extends DeclarativeWebScript
} }
else else
{ {
// MNT-11854 Consumer allowed to create Discussion, Wiki, Blog and Link if she/he creates the first item // The NodeRef is the container (if it exists)
if (siteService.hasContainer(siteName, BlogServiceImpl.BLOG_COMPONENT)) if (siteService.hasContainer(siteName, BlogServiceImpl.BLOG_COMPONENT))
{ {
nodeRef = site.getNodeRef(); nodeRef = siteService.getContainer(siteName, BlogServiceImpl.BLOG_COMPONENT);
} }
} }
} }

4
source/java/org/alfresco/repo/web/scripts/discussion/AbstractDiscussionWebScript.java
View File

@@ -533,10 +533,10 @@ public abstract class AbstractDiscussionWebScript extends DeclarativeWebScript
} }
else else
{ {
// MNT-11854 Consumer allowed to create Discussion, Wiki, Blog and Link if she/he creates the first item // The NodeRef is the container (if it exists)
if (siteService.hasContainer(siteName, DiscussionServiceImpl.DISCUSSION_COMPONENT)) if (siteService.hasContainer(siteName, DiscussionServiceImpl.DISCUSSION_COMPONENT))
{ {
nodeRef = site.getNodeRef(); nodeRef = siteService.getContainer(siteName, DiscussionServiceImpl.DISCUSSION_COMPONENT);
} }
} }
} }

21
source/java/org/alfresco/repo/web/scripts/links/LinksListGet.java
View File

@@ -140,8 +140,25 @@ public class LinksListGet extends AbstractLinksWebScript
} }
// We need the container node for permissions checking // We need the container node for permissions checking
// MNT-11854 Consumer allowed to create Discussion, Wiki, Blog and Link if she/he creates the first item NodeRef container;
NodeRef container = site.getNodeRef(); if (links.getPage().size() > 0)
{
container = links.getPage().get(0).getContainerNodeRef();
}
else
{
// Find the container (if it's been created yet)
container = siteService.getContainer(
site.getShortName(), LinksServiceImpl.LINKS_COMPONENT);
if (container == null)
{
// Brand new site, no write operations on links have happened
// Fudge it for now with the site itself, the first write call
// will have the container created
container = site.getNodeRef();
}
}
// All done // All done
Map<String, Object> model = new HashMap<String, Object>(); Map<String, Object> model = new HashMap<String, Object>();