From d35effc8d281de10132ad27078f57bdbcd148d47 Mon Sep 17 00:00:00 2001
From: Sven Marnach <sven@marnach.net>
Date: Tue, 15 Dec 2015 13:58:06 +0100
Subject: [PATCH 1/2] Add the ActiveTable and Vector Draw XBlocks to
 ADVANCED_COMPONENT_TYPES.

---
 cms/envs/common.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index bcd96c52b4..af89b610c3 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -1006,6 +1006,8 @@ ADVANCED_COMPONENT_TYPES = [
     'pb-dashboard',
     'poll',
     'survey',
+    'activetable',
+    'vectordraw',
     # Some of the XBlocks from pmitros repos are sometimes prototypes.
     # Use with caution.
     'concept',  # Concept mapper. See https://github.com/pmitros/ConceptXBlock

From e15907c76f6e67053af7d490b53f24ee1c4d9dc8 Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@edx.org>
Date: Tue, 15 Dec 2015 10:06:40 -0500
Subject: [PATCH 2/2] Revert "Remove staff debug category type whitelist."

This reverts commit bb25473a7cbcff3f6dc9ee1506b20451ac0ed5d2.

Reason for revert: Was breaking display on Course About and Info
pages.
---
 lms/templates/staff_problem_info.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lms/templates/staff_problem_info.html b/lms/templates/staff_problem_info.html
index 96d06ac684..c422c9839c 100644
--- a/lms/templates/staff_problem_info.html
+++ b/lms/templates/staff_problem_info.html
@@ -6,6 +6,7 @@ from django.template.defaultfilters import escapejs
 
 ## The JS for this is defined in xqa_interface.html
 ${block_content}
+%if location.category in ['problem','video','html','combinedopenended','graphical_slider_tool', 'library_content']:
 %  if edit_link:
   <div>
       <a href="${edit_link}">Edit</a>
@@ -141,3 +142,5 @@ $(function () {
     );
 });
 </script>
+%endif
+