Merge pull request #4199 from Shadowghost/collection-settings

Add setting for collection management

src/components/itemContextMenu.js

@@ -15,7 +15,6 @@ import toast from './toast/toast';
         const user = options.user;
 
         const canPlay = playbackManager.canPlay(item);
-        const restrictOptions = (browser.operaTv || browser.web0s) && !user.Policy.IsAdministrator;
 
         const commands = [];
 
@@ -99,8 +98,8 @@ import toast from './toast/toast';
             });
         }
 
-        if (!restrictOptions) {
-            if (itemHelper.supportsAddingToCollection(item)) {
+        if (!browser.tv) {
+            if (itemHelper.supportsAddingToCollection(item) && options.EnableCollectionManagement) {
                 commands.push({
                     name: globalize.translate('AddToCollection'),
                     id: 'addtocollection',
@@ -272,7 +271,7 @@ import toast from './toast/toast';
             });
         }
 
-        if (!restrictOptions && options.share === true && itemHelper.canShare(item, user)) {
+        if (!browser.tv && options.share === true && itemHelper.canShare(item, user)) {
             commands.push({
                 name: globalize.translate('Share'),
                 id: 'share',