diff options
| author | adityacp | 2018-03-22 12:36:45 +0530 |
|---|---|---|
| committer | adityacp | 2018-03-22 12:36:45 +0530 |
| commit | 30be89eef46a248fe6f7ff26a923593ea8371fb1 (patch) | |
| tree | 7af1afd0a403e4c71579f9afe830c482e59c3add /yaksh/forms.py | |
| parent | e1c1d0d0d6ae170d3ce9966b98ec6d03ff35c062 (diff) | |
| parent | 4b356aa2f6097cd0f46292218f31ded18b631e53 (diff) | |
| download | online_test-30be89eef46a248fe6f7ff26a923593ea8371fb1.tar.gz online_test-30be89eef46a248fe6f7ff26a923593ea8371fb1.tar.bz2 online_test-30be89eef46a248fe6f7ff26a923593ea8371fb1.zip | |
Resolve conflicts and update to latest changes
Diffstat (limited to 'yaksh/forms.py')
| -rw-r--r-- | yaksh/forms.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/yaksh/forms.py b/yaksh/forms.py index 6e70d46..56a2302 100644 --- a/yaksh/forms.py +++ b/yaksh/forms.py @@ -85,10 +85,12 @@ class UserRegisterForm(forms.Form): department = forms.CharField( max_length=64, help_text='Department you work/study at') position = forms.CharField( - max_length=64, help_text='Student/Faculty/Researcher/Industry/etc.') + max_length=64, + help_text='Student/Faculty/Researcher/Industry/Fellowship/etc.') timezone = forms.ChoiceField( choices=[(tz, tz) for tz in pytz.common_timezones], - initial=pytz.utc) + help_text='Course timings are shown based on the selected timezone', + initial=pytz.country_timezones['IN'][0]) def clean_username(self): u_name = self.cleaned_data["username"] @@ -308,7 +310,7 @@ class UploadFileForm(forms.Form): class QuestionPaperForm(forms.ModelForm): class Meta: model = QuestionPaper - fields = ['shuffle_questions'] + fields = ['shuffle_questions', 'shuffle_testcases'] class LessonForm(forms.ModelForm): |