diff options
| author | mahesh | 2017-08-10 12:03:06 +0530 |
|---|---|---|
| committer | mahesh | 2017-08-10 12:03:06 +0530 |
| commit | 89d2b914445bd39caf90f72fd0ccdeddbcbd7fa8 (patch) | |
| tree | a1b18877cc9af28f62418b166080fcb4988db43e | |
| parent | 3044dff8f1b2dcc2541e5b4227f1299cb505f9d2 (diff) | |
| parent | 08eaf36d6345212a580a2ccddcdfae7bea85191d (diff) | |
| download | online_test-89d2b914445bd39caf90f72fd0ccdeddbcbd7fa8.tar.gz online_test-89d2b914445bd39caf90f72fd0ccdeddbcbd7fa8.tar.bz2 online_test-89d2b914445bd39caf90f72fd0ccdeddbcbd7fa8.zip | |
Merge branch 'master' of https://github.com/fossee/online_test into yaml_questions
| -rw-r--r-- | yaksh/admin.py | 6 | ||||
| -rw-r--r-- | yaksh/models.py | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/yaksh/admin.py b/yaksh/admin.py index 79d4930..199fb56 100644 --- a/yaksh/admin.py +++ b/yaksh/admin.py @@ -1,4 +1,4 @@ -from yaksh.models import Question, Quiz, QuestionPaper +from yaksh.models import Question, Quiz, QuestionPaper, Profile from yaksh.models import TestCase, StandardTestCase, StdIOBasedTestCase, Course, AnswerPaper from django.contrib import admin @@ -8,7 +8,11 @@ class AnswerPaperAdmin(admin.ModelAdmin): search_fields = ['user__first_name', 'user__last_name','user__username', "question_paper__quiz__description","user_ip" ] +class ProfileAdmin(admin.ModelAdmin): + search_fields = ['user__first_name', 'user__last_name','user__username', + "roll_number", "institute","department"] +admin.site.register(Profile, ProfileAdmin) admin.site.register(Question) admin.site.register(TestCase) admin.site.register(StandardTestCase) diff --git a/yaksh/models.py b/yaksh/models.py index f6504d7..fde203c 100644 --- a/yaksh/models.py +++ b/yaksh/models.py @@ -308,6 +308,9 @@ class Profile(models.Model): os.chmod(user_dir, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO) return user_dir + def __str__(self): + return '%s' % (self.user.get_full_name()) + ############################################################################### class Question(models.Model): |