Bug 1154257 - Helpees should not see "Choose a category" when viewing questions

app/js/question_controller.js

@@ -140,21 +140,24 @@
   */
   function add_thread_header(question) {
     var date_posted = Utils.time_since(new Date(question.updated));
-    var author = question.creator.display_name || question.creator.username;
 
     var displayable_metadata =
       Utils.convert_metadata_for_display(question.metadata);
 
+    User.is_helper().then(function(is_helper) {
       var html = nunjucks.render('thread_header.html', {
         date_posted: date_posted,
         displayable_metadata: displayable_metadata,
-      author: author,
+        viewer_is_helper: is_helper,
         categories: CATEGORIES,
         selected_category: question.category
       });
       question_thread.insertAdjacentHTML('afterbegin', html);
 
       var category_chooser = document.getElementById('category_chooser');
+      if (!category_chooser) {
+        return;
+      }
       category_chooser.addEventListener('change', function(evt) {
         var category = evt.target.value;
         if (category == question.category) {
@@ -162,6 +165,7 @@
         }
         SumoDB.set_category_for_question(category, question.id);
       });
+    });
   }
 
   /* The logic should mirror views/thread.html */

app/js/templates.js

@@ -497,6 +497,8 @@ output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLook
 output += "</span>\n</div>\n<h3 class=\"QuestionThread-date text-blue\">\n  ";
 output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "date_posted"), env.autoesc);
 output += "\n</h3>\n\n";
+if(runtime.contextOrFrameLookup(context, frame, "viewer_is_helper")) {
+output += "\n  ";
 output += "\n  <ul>\n    <li>\n      <div class=\"button\" data-icon=\"forward\">\n        <select id=\"category_chooser\">\n        ";
 frame = frame.push();
 var t_3 = runtime.contextOrFrameLookup(context, frame, "categories");
@@ -558,6 +560,9 @@ output += "\n        </option>\n      ";
 }
 frame = frame.pop();
 output += "\n        </select>\n      </div>\n    </li>\n  </ul>\n";
+;
+}
+output += "\n";
 cb(null, output);
 ;
 } catch (e) {

app/test/unit/mocks/mock_user.js

@@ -4,6 +4,7 @@
 
 var MockUser = {
   get_user: function() {},
+  is_helper: function() {},
   get_credentials: function() {},
   reauthenticate_user: function() {}
 };

app/test/unit/question_controller_test.js

@@ -86,6 +86,8 @@ suite('QuestionController', function() {
     window.parent.Notif = MockNotif;
 
     this.sinon.stub(User, 'get_user').returns(Promise.resolve(FAKE_USER));
+    this.sinon.stub(User, 'is_helper').returns(Promise.resolve(true));
+
     this.sinon.stub(Utils, 'get_url_parameters')
       .returns({id: DISPLAYED_QUESTION_ID});
     this.sinon.stub(Utils, 'time_since');
@@ -125,6 +127,6 @@ suite('QuestionController', function() {
   });
 
   test('only display new answers since last time', function() {
-    sinon.assert.calledOnce(nunjucks.render);
+    sinon.assert.calledOnce(nunjucks.render.withArgs('thread.html'));
   });
 });

app/views/thread_header.html

@@ -11,6 +11,7 @@
   {{ date_posted }}
 </h3>
 
+{% if viewer_is_helper %}
   {# This <ul><li> is needed to get the right Building block styling for that button #}
   <ul>
     <li>
@@ -26,3 +27,4 @@
       </div>
     </li>
   </ul>
+{% endif %}