fix default for activecode Qs

Author: runestonetest

controllers/admin.py

@@ -1474,6 +1474,7 @@ def add__or_update_assignment_question():
     question_type = db.questions[question_id].question_type
     chapter = db.questions[question_id].chapter
     subchapter = db.questions[question_id].subchapter
+    auto_grade = db.questions[question_id].autograde
     tmpSp = _get_question_sorting_priority(assignment_id, question_id)
     if tmpSp != None:
         sp = 1 + tmpSp
@@ -1510,6 +1511,10 @@ def add__or_update_assignment_question():
 
     autograde = request.vars.get('autograde')
     which_to_grade = request.vars.get('which_to_grade')
+    if question_type in ('activecode', 'actex'):
+        if auto_grade != 'unittest':
+            autograde = 'manual'
+            which_to_grade = ""
     try:
         # save the assignment_question
         db.assignment_questions.update_or_insert(

views/admin/assignments.html

@@ -343,7 +343,15 @@ <h4 class="modal-title" id="editModalHeader">Edit Question</h4>
     configure_tree_picker(question_picker, eBookConfig.toc.question_picker, $('#search-tree-question-picker'), 3,
         // TODO: Remember last user selections for points, autograde, and which_to_grade, instead of hard-coding them here.
         // Called when a node is checked.
-        function (node) { updateAssignmentRaw(node.id, 1, 'pct_correct', 'best_answer'); },
+        function (node) {
+          let autograde = 'pct_correct';
+          let whichto = 'best_answer';
+          if (node.text.indexOf("✓") === -1) {
+            autograde = 'manual';
+            whichto = '';
+          }
+          updateAssignmentRaw(node.id, 1, autograde, whichto);
+        },
         // Called when a node is unchecked.
         function (node) { remove_question(node.id); }
     );