mirror of
https://github.com/pretix/pretix.git
synced 2025-12-05 21:32:28 +00:00
Compare commits
4 Commits
e1f5678d7c
...
v1.6.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
17eb0a3817 | ||
|
|
a87cb75ed5 | ||
|
|
f70eb95346 | ||
|
|
9abdc6a3cc |
@@ -1 +1 @@
|
||||
__version__ = "1.6.0"
|
||||
__version__ = "1.6.1"
|
||||
|
||||
@@ -195,7 +195,7 @@ class ItemCreateForm(I18nModelForm):
|
||||
|
||||
instance = super().save(*args, **kwargs)
|
||||
|
||||
if not self.event.has_subevents:
|
||||
if not self.event.has_subevents and not self.cleaned_data.get('has_variations'):
|
||||
if self.cleaned_data.get('quota_option') == self.EXISTING and self.cleaned_data.get('quota_add_existing') is not None:
|
||||
quota = self.cleaned_data.get('quota_add_existing')
|
||||
quota.items.add(self.instance)
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
{% block inner %}
|
||||
<h2>{% trans "Import result" %}</h2>
|
||||
{% if job.state == "running" or job.state == "pending" %}
|
||||
<div class="empty-collection" data-job-waiting data-job-waiting-url="{% url "plugins:banktransfer:import.job" event=request.event.slug organizer=request.event.organizer.slug job=job.pk %}?ajax=1">
|
||||
<div class="empty-collection" data-job-waiting data-job-waiting-url="{% if request.event %}{% url "plugins:banktransfer:import.job" event=request.event.slug organizer=request.event.organizer.slug job=job.pk %}{% else %}{% url "plugins:banktransfer:import.job" organizer=request.organizer.slug job=job.pk %}{% endif %}?ajax=1">
|
||||
<p>
|
||||
<span class="fa big-grey-icon fa-cog fa big-rotating-icon"></span>
|
||||
</p>
|
||||
|
||||
@@ -26,4 +26,11 @@ $(document).ready(function () {
|
||||
hideDeselected(true);
|
||||
}
|
||||
);
|
||||
|
||||
function toggleblock() {
|
||||
$("#new-quota-group").closest('fieldset').toggle(!$("#id_has_variations").prop('checked'));
|
||||
}
|
||||
|
||||
$("#id_has_variations").change(toggleblock);
|
||||
toggleblock();
|
||||
});
|
||||
|
||||
@@ -97,7 +97,7 @@ setup(
|
||||
'pycparser==2.13',
|
||||
'django-redis==4.7.*',
|
||||
'redis==2.10.5',
|
||||
'stripe==1.22.*',
|
||||
'stripe==1.62.*',
|
||||
'chardet<3.1.0,>=3.0.2',
|
||||
'mt-940==4.7',
|
||||
'django-i18nfield>=1.0.1',
|
||||
|
||||
Reference in New Issue
Block a user