diff options
| author | ankitjavalkar | 2015-09-04 11:31:29 +0530 |
|---|---|---|
| committer | ankitjavalkar | 2015-09-04 18:55:15 +0530 |
| commit | 3ee050fe509b83f36188566ee57b3dd16d94a8a7 (patch) | |
| tree | 653fbd703850e1e12f875bc5422ec3cb809c6e07 /testapp/yaksh_app/views.py | |
| parent | f5568068a34e23208fb5b2a33dd806f10aab9806 (diff) | |
| download | online_test-3ee050fe509b83f36188566ee57b3dd16d94a8a7.tar.gz online_test-3ee050fe509b83f36188566ee57b3dd16d94a8a7.tar.bz2 online_test-3ee050fe509b83f36188566ee57b3dd16d94a8a7.zip | |
Fix conflicts and add jquery file
Diffstat (limited to 'testapp/yaksh_app/views.py')
| -rw-r--r-- | testapp/yaksh_app/views.py | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/testapp/yaksh_app/views.py b/testapp/yaksh_app/views.py index 6623ad5..f6666e6 100644 --- a/testapp/yaksh_app/views.py +++ b/testapp/yaksh_app/views.py @@ -16,20 +16,12 @@ from taggit.models import Tag from itertools import chain import json # Local imports. -<<<<<<< HEAD:testapp/exam/views.py -from testapp.exam.models import Quiz, Question, QuestionPaper, QuestionSet -from testapp.exam.models import Profile, Answer, AnswerPaper, User, TestCase -from testapp.exam.forms import UserRegisterForm, UserLoginForm, QuizForm,\ - QuestionForm, RandomQuestionForm, TestCaseFormSet,\ - QuestionFilterForm -from testapp.exam.xmlrpc_clients import code_server -======= from testapp.yaksh_app.models import Quiz, Question, QuestionPaper, QuestionSet from testapp.yaksh_app.models import Profile, Answer, AnswerPaper, User, TestCase from testapp.yaksh_app.forms import UserRegisterForm, UserLoginForm, QuizForm,\ - QuestionForm, RandomQuestionForm, TestCaseFormSet + QuestionForm, RandomQuestionForm, TestCaseFormSet,\ + QuestionFilterForm from testapp.yaksh_app.xmlrpc_clients import code_server ->>>>>>> Change app name to yaksh:testapp/yaksh_app/views.py from settings import URL_ROOT from testapp.yaksh_app.models import AssignmentUpload @@ -1297,15 +1289,10 @@ def show_all_questions(request): form = QuestionFilterForm() context = {'papers': [], 'question': None, -<<<<<<< HEAD:testapp/exam/views.py 'questions': questions, 'form': form } return my_render_to_response('exam/showquestions.html', context, -======= - 'questions': questions} - return my_render_to_response('yaksh_app/showquestions.html', context, ->>>>>>> Change app name to yaksh:testapp/yaksh_app/views.py context_instance=ci) else: for i in data: @@ -1314,15 +1301,10 @@ def show_all_questions(request): form = QuestionFilterForm() context = {'papers': [], 'question': None, -<<<<<<< HEAD:testapp/exam/views.py 'questions': questions, 'form': form } return my_render_to_response('exam/showquestions.html', context, -======= - 'questions': questions} - return my_render_to_response('yaksh_app/showquestions.html', context, ->>>>>>> Change app name to yaksh:testapp/yaksh_app/views.py context_instance=ci) elif request.method == 'POST' and request.POST.get('edit') == 'edit': data = request.POST.getlist('question') @@ -1364,15 +1346,10 @@ def show_all_questions(request): form = QuestionFilterForm() context = {'papers': [], 'question': None, -<<<<<<< HEAD:testapp/exam/views.py 'questions': questions, 'form': form } return my_render_to_response('exam/showquestions.html', context, -======= - 'questions': questions} - return my_render_to_response('yaksh_app/showquestions.html', context, ->>>>>>> Change app name to yaksh:testapp/yaksh_app/views.py context_instance=ci) |