Merge branch 'staging' of github.com:code-dot-org/code-dot-org into s…

…taging
code-dot-org · Sep 14, 2018 · 0368d28 · 0368d28
2 parents d45ad3a + 6b30cf8
commit 0368d28
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/apps/src/templates/teacherDashboard/sections.js b/apps/src/templates/teacherDashboard/sections.js
@@ -56,17 +56,17 @@ export function renderTextResponsesTable(section, validScripts) {
   registerReducers({textResponses, scriptSelection, sectionData});
   const store = getStore();
   store.dispatch(setSection(section));
-  store.dispatch(loadValidScripts(section, validScripts)).then(() => {
-    const scriptId = store.getState().scriptSelection.scriptId;
-    store.dispatch(asyncLoadTextResponses(section.id, scriptId, () => {
-      ReactDOM.render(
-        <Provider store={store}>
-          <TextResponses sectionId={section.id}/>
-        </Provider>,
-        element
-      );
-    }));
-  });
+  store.dispatch(loadValidScripts(section, validScripts));
+
+  const scriptId = store.getState().scriptSelection.scriptId;
+  store.dispatch(asyncLoadTextResponses(section.id, scriptId, () => {
+    ReactDOM.render(
+      <Provider store={store}>
+        <TextResponses sectionId={section.id}/>
+      </Provider>,
+      element
+    );
+  }));
 }
 
 export function renderStatsTable(section) {

diff --git a/dashboard/app/views/levels/editors/_blockly.html.haml b/dashboard/app/views/levels/editors/_blockly.html.haml
@@ -14,8 +14,6 @@
   = f.select :skin, options_for_select(@level.class.skins, @level.skin)
 .field
   = render partial: 'levels/editors/checkboxes', locals: {f: f, field_name: :is_k1, description: "Is K1 level"}
-.field
-  = render partial: 'levels/editors/checkboxes', locals: {f: f, field_name: :never_autoplay_video, description: "Never autoplay video"}
 .field
   = render partial: 'levels/editors/checkboxes', locals: {f: f, field_name: :use_modal_function_editor, description: "Use modal function editor"}
 .field

diff --git a/dashboard/app/views/levels/editors/_curriculum_specific.html.haml b/dashboard/app/views/levels/editors/_curriculum_specific.html.haml
@@ -1,3 +1,6 @@
+.field
+  = render partial: 'levels/editors/checkboxes', locals: {f: f, field_name: :never_autoplay_video, description: "Never autoplay video"}
+
 .field
   = f.label :thumbnail_url, 'Optional thumbnail URL (overrides default thumbnail)'
   = f.text_field :thumbnail_url