Resolve conflicts in grade user, custom filters etc

1 files changed, 20 insertions, 8 deletions

diff --git a/yaksh/views.py b/yaksh/views.py
index 5bbe547..6cebe3a 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -6,10 +6,12 @@ from django.shortcuts import render, get_object_or_404, redirect
 from django.template import Context, Template
 from django.http import Http404
 from django.db.models import Max, Q, F
+from django.db import models
 from django.views.decorators.csrf import csrf_exempt
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import Group
 from django.forms.models import inlineformset_factory
+from django.forms import fields
 from django.utils import timezone
 from django.core.exceptions import (
     MultipleObjectsReturned, ObjectDoesNotExist
@@ -100,6 +102,13 @@ def get_html_text(md_text):
     return Markdown().convert(md_text)
 
 
+def formfield_callback(field):
+    if (isinstance(field, models.TextField) and field.name == 'expected_output'
+            or field.name == 'expected_input'):
+        return fields.CharField(strip=False)
+    return field.formfield()
+
+
 @email_verified
 def index(request, next_url=None):
     """The start page.
@@ -246,8 +255,12 @@ def add_question(request, question_id=None):
                 file.toggle_hide_status()
         formsets = []
         for testcase in TestCase.__subclasses__():
-            formset = inlineformset_factory(Question, testcase, extra=0,
-                                            fields='__all__')
+
+            formset = inlineformset_factory(
+                                Question, testcase, extra=0,
+                                fields='__all__',
+                                formfield_callback=formfield_callback
+                                )
             formsets.append(formset(
                 request.POST, request.FILES, instance=question
                 )
@@ -916,10 +929,9 @@ def complete(request, reason=None, attempt_num=None, questionpaper_id=None,
     """Show a page to inform user that the quiz has been completed."""
     user = request.user
     if questionpaper_id is None:
-        message = (
-            reason or "An Unexpected Error occurred."
-            " Please contact your instructor/administrator."
-        )
+        message = reason or ("An Unexpected Error occurred. Please "
+                             "contact your instructor/administrator."
+                             )
         context = {'message': message}
         return my_render_to_response(request, 'yaksh/complete.html', context)
     else:
@@ -957,7 +969,7 @@ def add_course(request, course_id=None):
     if not is_moderator(user):
         raise Http404('You are not allowed to view this page')
     if request.method == 'POST':
-        form = CourseForm(request.POST, instance=course)
+        form = CourseForm(user, request.POST, instance=course)
         if form.is_valid():
             new_course = form.save(commit=False)
             if course_id is None:
@@ -972,7 +984,7 @@ def add_course(request, course_id=None):
                 request, 'yaksh/add_course.html', {'form': form}
             )
     else:
-        form = CourseForm(instance=course)
+        form = CourseForm(user, instance=course)
         return my_render_to_response(
             request, 'yaksh/add_course.html', {'form': form}
         )