diff --git a/smash/web/forms/contact_attempt_forms.py b/smash/web/forms/contact_attempt_forms.py index 0135a37a41266a1d11efd8aac498dc75ed7b59b8..39bb260e180536b76cf7b8c5e6ca4c59ddc12868 100644 --- a/smash/web/forms/contact_attempt_forms.py +++ b/smash/web/forms/contact_attempt_forms.py @@ -3,6 +3,7 @@ from django.forms import ModelForm from web.forms.forms import DATETIMEPICKER_DATE_ATTRS from web.models import ContactAttempt, Worker +from web.models.worker_study_role import WORKER_STAFF class ContactAttemptForm(ModelForm): @@ -18,6 +19,9 @@ class ContactAttemptForm(ModelForm): if self.user is None: raise TypeError("Worker not defined for: " + user.username) super(ContactAttemptForm, self).__init__(*args, **kwargs) + self.fields['subject'].disabled = True + self.fields['worker'].queryset = Worker.get_workers_by_worker_type(WORKER_STAFF).distinct().order_by( + 'first_name', 'last_name') class ContactAttemptAddForm(ContactAttemptForm): @@ -29,7 +33,6 @@ class ContactAttemptAddForm(ContactAttemptForm): subject = kwargs.pop('subject', None) super(ContactAttemptAddForm, self).__init__(*args, **kwargs) self.fields['subject'].initial = subject.id - self.fields['subject'].disabled = True self.fields['worker'].initial = self.user @@ -40,4 +43,3 @@ class ContactAttemptEditForm(ContactAttemptForm): def __init__(self, *args, **kwargs): super(ContactAttemptEditForm, self).__init__(*args, **kwargs) - self.fields['subject'].disabled = True