Fix MCQ showing empty tip box even if no tips exist

mentoring/components/mcq.py

@@ -74,17 +74,16 @@ class MCQBlock(QuestionnaireAbstractBlock):
             if submission in tip.values:
                 tips_html.append(tip.render('mentoring_view').content)
 
-        formatted_tips = ResourceLoader(__name__).render_template('templates/html/tip_choice_group.html', {
-            'self': self,
-            'tips_html': tips_html,
-            'completed': correct,
-        })
+        if tips_html:
+            formatted_tips = ResourceLoader(__name__).render_template('templates/html/tip_choice_group.html', {
+                'tips_html': tips_html,
+            })
 
         self.student_choice = submission
         result = {
             'submission': submission,
             'status': 'correct' if correct else 'incorrect',
-            'tips': formatted_tips,
+            'tips': formatted_tips if tips_html else None,
             'weight': self.weight,
             'score': 1 if correct else 0,
         }

mentoring/components/mrq.py

@@ -103,9 +103,7 @@ class MRQBlock(QuestionnaireAbstractBlock):
                 loader = ResourceLoader(__name__)
                 choice_result['completed'] = choice_completed
                 choice_result['tips'] = loader.render_template('templates/html/tip_choice_group.html', {
-                    'self': self,
                     'tips_html': choice_tips_html,
-                    'completed': choice_completed,
                 })
 
             results.append(choice_result)