CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-09 15:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #779: add form field for unpaid option of checkin lists in subevent detail view (#781)

Browse Source 
* add form field for unpaid option of checkin lists in subevent detail view

* change order of include_pending field

* also change the order in new check in lists
This commit is contained in:
Felix Rindt
2018-02-26 10:17:28 +01:00
committed by Raphael Michel
parent 675b853b29
commit f763a8694b
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/control/templates/pretixcontrol/subevents/detail.html
View File

@@ -150,6 +150,7 @@
</div> </div>
<div class="panel-body form-horizontal"> <div class="panel-body form-horizontal">
{% bootstrap_form_errors form %} {% bootstrap_form_errors form %}
{% bootstrap_field form.include_pending layout="control" %}
{% bootstrap_field form.all_products layout="control" %} {% bootstrap_field form.all_products layout="control" %}
{% bootstrap_field form.limit_products layout="control" %} {% bootstrap_field form.limit_products layout="control" %}
</div> </div>
@@ -177,6 +178,7 @@
</h4> </h4>
</div> </div>
<div class="panel-body form-horizontal"> <div class="panel-body form-horizontal">
{% bootstrap_field cl_formset.empty_form.include_pending layout="control" %}
{% bootstrap_field cl_formset.empty_form.all_products layout="control" %} {% bootstrap_field cl_formset.empty_form.all_products layout="control" %}
{% bootstrap_field cl_formset.empty_form.limit_products layout="control" %} {% bootstrap_field cl_formset.empty_form.limit_products layout="control" %}
</div> </div>

2
src/pretix/control/views/subevents.py
View File

@@ -148,6 +148,7 @@ class SubEventEditorMixin(MetaDataEditorMixin):
'name': cl.name, 'name': cl.name,
'all_products': cl.all_products, 'all_products': cl.all_products,
'limit_products': cl.limit_products.all(), 'limit_products': cl.limit_products.all(),
'include_pending': cl.include_pending,
} for cl in self.copy_from.checkinlist_set.prefetch_related('limit_products') } for cl in self.copy_from.checkinlist_set.prefetch_related('limit_products')
] ]
extra = len(kwargs['initial']) extra = len(kwargs['initial'])
@@ -156,6 +157,7 @@ class SubEventEditorMixin(MetaDataEditorMixin):
{ {
'name': '', 'name': '',
'all_products': True, 'all_products': True,
'include_pending': False,
} }
] ]
extra = 1 extra = 1