Merge branch 'master' into use_webpack

Author: runestonetest

controllers/admin.py

@@ -1441,9 +1441,30 @@ def createquestion():
             htmlsrc=request.vars["htmlsrc"],
         )
 
-        db.assignment_questions.insert(
-            assignment_id=assignmentid, question_id=newqID, timed=timed, points=points
-        )
+        if request.vars["template"] == "datafile":
+            # datafiles are not questions, but we would like instructors to be able
+            # to add their own datafiles for projects or exercises. So we store
+            # the datafile contents in the database instead of adding a question
+            # to the assignment.
+            divid = request.vars["name"].strip()
+            q = request.vars["question"].lstrip()
+            q = q.split("\n")
+            first_blank = q.index("")
+            q = "\n".join([x.lstrip() for x in q[first_blank + 1 :]])
+            db.source_code.update_or_insert(
+                (db.source_code.acid == divid)
+                & (db.source_code.course_id == base_course),
+                main_code=q,
+                course_id=base_course,
+                acid=divid,
+            )
+        else:
+            db.assignment_questions.insert(
+                assignment_id=assignmentid,
+                question_id=newqID,
+                timed=timed,
+                points=points,
+            )
 
         returndict = {request.vars["name"]: newqID, "timed": timed, "points": points}
 

views/designer/index.html

@@ -8,7 +8,9 @@
 
 <h3>{{=message}}</h3>
 
-<p>This page allows you to select a book for your own class. Once you have selected and built the book, you will also be
+<p><strong>For Instructors ONLY</strong> If you are a self learner you DO NOT need to build your own course.  If you are a student and think that building your own course will show you the answers, YOU ARE WRONG.</p>
+<p>
+    This page allows you to select a book for your own class. Once you have selected and built the book, you will also be
     able to edit
     the table of contents to re-order or remove content, and create assignments for your students. These assignments
     will be publish