From 2669a51fe1f4e70f602767e338b06e1efa78e123 Mon Sep 17 00:00:00 2001
From: Dave Woestenborghs <dave.woestenborghs@gmail.com>
Date: Wed, 25 Jul 2018 16:01:33 +0300
Subject: [PATCH] Only show umbraco.tv and our.umbraco.org content to admin
 users in the help drawer (#2513)

---
 .../common/drawers/help/help.controller.js    | 27 ++++++++++++-------
 .../src/views/common/drawers/help/help.html   |  6 ++---
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js
index 4d2b43c078..1f2daff083 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.controller.js
@@ -43,15 +43,17 @@
             setSectionName();
 
             userService.getCurrentUser().then(function (user) {
-
+                
                 vm.userType = user.userType;
                 vm.userLang = user.locale;
 
+                vm.hasAccessToSettings = _.contains(user.allowedSections, 'settings');                
+
                 evts.push(eventsService.on("appState.treeState.changed", function (e, args) {
                     handleSectionChange();
                 }));
 
-                findHelp(vm.section, vm.tree, vm.usertype, vm.userLang);
+                findHelp(vm.section, vm.tree, vm.userType, vm.userLang);
 
             });
             
@@ -76,17 +78,20 @@
                     vm.tree = $routeParams.tree;
 
                     setSectionName();
-                    findHelp(vm.section, vm.tree, vm.usertype, vm.userLang);
+                    findHelp(vm.section, vm.tree, vm.userType, vm.userLang);
 
                 }
             });
         }
 
         function findHelp(section, tree, usertype, userLang) {
+
+            if (vm.hasAccessToSettings) {
+                helpService.getContextHelpForPage(section, tree).then(function (topics) {
+                    vm.topics = topics;
+                });
+            }
             
-            helpService.getContextHelpForPage(section, tree).then(function (topics) {
-                vm.topics = topics;
-            });
 
             var rq = {};
             rq.section = vm.section;
@@ -108,10 +113,12 @@
                 rq.path = rq.section + "/" + $routeParams.tree + "/" + $routeParams.method;
             }
 
-            helpService.findVideos(rq).then(function(videos){
-    	        vm.videos = videos;
-            });
-            
+
+            if (vm.hasAccessToSettings) {
+                helpService.findVideos(rq).then(function (videos) {
+                    vm.videos = videos;
+                });
+            }                       
         }
 
         function setSectionName() {
diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
index a4d4af6093..7fb25df0d5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
+++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
@@ -80,7 +80,7 @@
         </div>
 
         <!--  Umbraco tv content -->
-        <div class="umb-help-section" data-element="help-videos">
+        <div class="umb-help-section" data-element="help-videos" ng-if="vm.hasAccessToSettings">
             <h5 class="umb-help-section__title" ng-if="vm.videos.length > 0">Videos</h5>
             <ul class="umb-help-list">
                 <li class="umb-help-list-item" ng-repeat="video in vm.videos track by $index">
@@ -94,7 +94,7 @@
         </div>
 
         <!--  Links -->
-        <div class="umb-help-section" data-element="help-links">
+        <div class="umb-help-section" data-element="help-links" ng-if="vm.hasAccessToSettings">
             <a data-element="help-link-umbraco-tv" class="umb-help-badge" target="_blank" href="http://umbraco.tv?utm_source=core&utm_medium=help&utm_content=link&utm_campaign=tv">
                 <i class="umb-help-badge__icon icon-tv-old"></i>
                 <div class="umb-help-badge__title">Visit umbraco.tv</div>
@@ -128,4 +128,4 @@
 
     </umb-drawer-footer>
 
-</umb-drawer-view>
\ No newline at end of file
+</umb-drawer-view>