diff --git a/smash/web/forms/voucher_forms.py b/smash/web/forms/voucher_forms.py index efb1c590c9f7d526d172a7c332d1ed8cebb4bd03..7768920a81e851f7cc00a4174f3c18b28eb48fb6 100644 --- a/smash/web/forms/voucher_forms.py +++ b/smash/web/forms/voucher_forms.py @@ -8,7 +8,7 @@ from django.utils import timezone from web.algorithm import VerhoeffAlgorithm from web.forms.forms import DATEPICKER_DATE_ATTRS from web.models import VoucherType, VoucherTypePrice, Voucher, Worker -from web.models.constants import VOUCHER_STATUS_NEW, VOUCHER_STATUS_USED, VOUCHER_STATUS_EXPIRED +from web.models.constants import VOUCHER_STATUS_USED, VOUCHER_STATUS_EXPIRED from web.models.worker_study_role import WORKER_VOUCHER_PARTNER logger = logging.getLogger(__name__) @@ -58,7 +58,7 @@ class VoucherForm(ModelForm): self.fields['hours'].widget.attrs['readonly'] = True self.fields['usage_partner'].widget.attrs['readonly'] = True - if instance.status == VOUCHER_STATUS_USED or instance.status == VOUCHER_STATUS_EXPIRED: + if instance.status in [VOUCHER_STATUS_USED, VOUCHER_STATUS_EXPIRED]: self.fields['status'].widget.attrs['readonly'] = True self.fields['feedback'].widget.attrs['readonly'] = True diff --git a/smash/web/templates/vouchers/add_edit.html b/smash/web/templates/vouchers/add_edit.html index c3aa458e57174ffe125fba60f612f69f1edf9ad0..c0083e92cc23d2b666a8a60547a0237e04123da5 100644 --- a/smash/web/templates/vouchers/add_edit.html +++ b/smash/web/templates/vouchers/add_edit.html @@ -61,7 +61,7 @@ </form> {% if voucher.id %} <h3 class="box-title">List of voucher partner sessions - {% if voucher.status == 'NEW' or voucher.status == 'IN_USE' %} + {% if voucher.status in 'NEW,IN_USE' %} <a title="add a new voucher partner session" id="add-voucher-partner-session"