Merged HEAD (5.1) to 5.1.N (5.1.1)

114759 dwebster: ACE-4174: Add concept of hidden channels to ChannelService and mark old core social publishing channels as hidden by default.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@114856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2015-10-21 09:03:14 +00:00
parent a18bc456a6
commit 6dfc8e8517
10 changed files with 40 additions and 2 deletions

View File

@@ -118,7 +118,15 @@ public class ChannelServiceImpl implements ChannelService
*/
public List<ChannelType> getChannelTypes()
{
return new ArrayList<ChannelType>(channelTypes.values());
List<ChannelType> result = new ArrayList<ChannelType>();
for (ChannelType channelType : channelTypes.values())
{
if (!channelType.isHidden())
{
result.add(channelType);
}
}
return result;
}
/**