From b7dac530220e2ff35d4f18b3674416aac32b9333 Mon Sep 17 00:00:00 2001
From: Carlos Vega <carlos.vega@.uni.lu>
Date: Wed, 26 Sep 2018 10:56:32 +0200
Subject: [PATCH] Fixes issue #222 in which the voucher partner and health
partner shown the option to select role. This option is now hidden.
---
smash/web/forms/worker_form.py | 8 ++++++--
smash/web/templates/doctors/add.html | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/smash/web/forms/worker_form.py b/smash/web/forms/worker_form.py
index 0321c7bf..bcbb40ca 100644
--- a/smash/web/forms/worker_form.py
+++ b/smash/web/forms/worker_form.py
@@ -9,7 +9,7 @@ from django_common.auth_backends import User
from web.models import Worker, WorkerStudyRole
from web.models.constants import GLOBAL_STUDY_ID
from web.models.worker import role_choices_by_worker_type, worker_type_by_worker
-from web.models.worker_study_role import WORKER_STAFF, WORKER_VOUCHER_PARTNER
+from web.models.worker_study_role import WORKER_STAFF, WORKER_VOUCHER_PARTNER, WORKER_HEALTH_PARTNER
logger = logging.getLogger(__name__)
@@ -33,7 +33,11 @@ class WorkerForm(ModelForm):
initial_role = roles[0].role
choices = role_choices_by_worker_type(worker_type)
- self.fields['role'] = forms.ChoiceField(label='Role', choices=choices)
+ if worker_type in [WORKER_VOUCHER_PARTNER, WORKER_HEALTH_PARTNER]:
+ self.fields['role'] = forms.ChoiceField(label='Role', choices=choices, widget=forms.HiddenInput(), required=False)
+ else:
+ self.fields['role'] = forms.ChoiceField(label='Role', choices=choices)
+
self.fields['role'].initial = initial_role
del self.fields['user']
diff --git a/smash/web/templates/doctors/add.html b/smash/web/templates/doctors/add.html
index 88be6696..ad00fa25 100644
--- a/smash/web/templates/doctors/add.html
+++ b/smash/web/templates/doctors/add.html
@@ -27,7 +27,7 @@
<div class="box-body">
<div class="col-sm-6">
- {% for field in form %}
+ {% for field in form.visible_fields %}
<div class="form-group {% if field.errors %}has-error{% endif %}">
<label for="{# TODO #}" class="col-sm-4 control-label">
{{ field.label }}
--
GitLab