summaryrefslogtreecommitdiff
path: root/yaksh/admin.py
diff options
context:
space:
mode:
authorprathamesh2016-08-31 01:37:20 +0530
committerprathamesh2016-08-31 01:37:20 +0530
commit24593514378e86cd2f0ef62e11e8a4c9dee0f5ad (patch)
tree686d263a31445a19d6addd4fca13e9bb1041755d /yaksh/admin.py
parent11dec9deba7120f85d3d2b47cfd31fca8587bbbc (diff)
parentaefc8eed3b0c18520059b4005978f1db9cf5591b (diff)
downloadonline_test-24593514378e86cd2f0ef62e11e8a4c9dee0f5ad.tar.gz
online_test-24593514378e86cd2f0ef62e11e8a4c9dee0f5ad.tar.bz2
online_test-24593514378e86cd2f0ef62e11e8a4c9dee0f5ad.zip
Merge branch 'master' of https://github.com/FOSSEE/online_test into view_answerpaper
Resolved Conflicts: yaksh/views.py
Diffstat (limited to 'yaksh/admin.py')
-rw-r--r--yaksh/admin.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/yaksh/admin.py b/yaksh/admin.py
index c31b99b..4ef2f3d 100644
--- a/yaksh/admin.py
+++ b/yaksh/admin.py
@@ -1,4 +1,6 @@
from yaksh.models import Question, Quiz
+from yaksh.models import TestCase, StandardTestCase, StdoutBasedTestCase, Course
+from yaksh.models import Question, Quiz, Course, QuestionPaper
from yaksh.models import TestCase, StandardTestCase, StdoutBasedTestCase
from django.contrib import admin
@@ -6,4 +8,6 @@ admin.site.register(Question)
admin.site.register(TestCase)
admin.site.register(StandardTestCase)
admin.site.register(StdoutBasedTestCase)
+admin.site.register(Course)
admin.site.register(Quiz)
+admin.site.register(QuestionPaper)