CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Visibly de-highlight disabled products

Browse Source
This commit is contained in:
Raphael Michel
2021-05-19 09:53:25 +02:00
parent f20ac78586
commit ac4e4a2578
8 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pretix/control/forms/__init__.py
View File

@@ -42,8 +42,11 @@ from django.core.files import File
from django.core.files.uploadedfile import UploadedFile
from django.forms.utils import from_current_timezone
from django.urls import reverse
from django.utils.html import escape
from django.utils.safestring import mark_safe
from django.utils.timezone import now
from django.utils.translation import gettext_lazy as _
from django_scopes.forms import SafeModelMultipleChoiceField
from ...base.forms import I18nModelForm, SecretKeySettingsField
@@ -411,3 +414,8 @@ class SMTPSettingsMixin(forms.Form):
if data.get('smtp_use_tls') and data.get('smtp_use_ssl'):
raise ValidationError(_('You can activate either SSL or STARTTLS security, but not both at the same time.'))
return data
class ItemMultipleChoiceField(SafeModelMultipleChoiceField):
def label_from_instance(self, obj):
return str(obj) if obj.active else mark_safe(f'<strike class="text-muted">{escape(obj)}</strike>')

5
src/pretix/control/forms/checkin.py
View File

@@ -31,6 +31,7 @@ from django_scopes.forms import (
from pretix.base.channels import get_all_sales_channels
from pretix.base.models.checkin import CheckinList
from pretix.control.forms import ItemMultipleChoiceField
from pretix.control.forms.widgets import Select2
@@ -120,7 +121,7 @@ class CheckinListForm(forms.ModelForm):
'exit_all_at': NextTimeInput(attrs={'class': 'timepickerfield'}),
}
field_classes = {
'limit_products': SafeModelMultipleChoiceField,
'limit_products': ItemMultipleChoiceField,
'gates': SafeModelMultipleChoiceField,
'subevent': SafeModelChoiceField,
'exit_all_at': NextTimeField,
@@ -164,7 +165,7 @@ class SimpleCheckinListForm(forms.ModelForm):
}),
}
field_classes = {
'limit_products': SafeModelMultipleChoiceField,
'limit_products': ItemMultipleChoiceField,
'subevent': SafeModelChoiceField,
'gates': SafeModelMultipleChoiceField,
}

15
src/pretix/control/forms/item.py
View File

@@ -41,6 +41,8 @@ from django.core.exceptions import ValidationError
from django.db.models import Max
from django.forms.formsets import DELETION_FIELD_NAME
from django.urls import reverse
from django.utils.html import escape
from django.utils.safestring import mark_safe
from django.utils.translation import (
gettext as __, gettext_lazy as _, pgettext_lazy,
)
@@ -57,7 +59,9 @@ from pretix.base.models import (
)
from pretix.base.models.items import ItemAddOn, ItemBundle, ItemMetaValue
from pretix.base.signals import item_copy_data
from pretix.control.forms import SplitDateTimeField, SplitDateTimePickerWidget
from pretix.control.forms import (
ItemMultipleChoiceField, SplitDateTimeField, SplitDateTimePickerWidget,
)
from pretix.control.forms.widgets import Select2
from pretix.helpers.models import modelcopy
from pretix.helpers.money import change_decimal_field
@@ -168,7 +172,7 @@ class QuestionForm(I18nModelForm):
field_classes = {
'valid_datetime_min': SplitDateTimeField,
'valid_datetime_max': SplitDateTimeField,
'items': SafeModelMultipleChoiceField,
'items': ItemMultipleChoiceField,
'dependency_question': SafeModelChoiceField,
}
@@ -200,9 +204,12 @@ class QuotaForm(I18nModelForm):
for item in items:
if len(item.variations.all()) > 0:
for v in item.variations.all():
choices.append(('{}-{}'.format(item.pk, v.pk), '{} – {}'.format(item, v.value)))
choices.append((
'{}-{}'.format(item.pk, v.pk),
'{} – {}'.format(item, v.value) if item.active else mark_safe(f'<strike class="text-muted">{escape(item)} – {escape(v.value)}</strike>')
))
else:
choices.append(('{}'.format(item.pk), str(item)))
choices.append(('{}'.format(item.pk), str(item) if item.active else mark_safe(f'<strike class="text-muted">{escape(item)}</strike>')))
self.fields['itemvars'] = forms.MultipleChoiceField(
label=_('Products'),

7
src/pretix/control/templates/pretixcontrol/items/index.html
View File

@@ -44,11 +44,10 @@
{% regroup items by category as cat_list %}
{% for c in cat_list %}
{% for i in c.list %}
<tr>
<tr {% if not i.active %}class="row-muted"{% endif %}>
<td><strong>
{% if not i.active %}<strike>{% endif %}
<a href="
{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}">{{ i }}</a>
<a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}">{{ i }}</a>
{% if not i.active %}</strike>{% endif %}
</strong>
<br>
@@ -109,7 +108,7 @@
<a href="{% url "control:event.items.up" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}" class="btn btn-default btn-sm {% if forloop.counter0 == 0 and is_paginated and not page_obj.has_previous %}disabled{% endif %}"><i class="fa fa-arrow-up"></i></a>
<a href="{% url "control:event.items.down" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}" class="btn btn-default btn-sm {% if forloop.revcounter0 == 0 and is_paginated and not page_obj.has_next %}disabled{% endif %}"><i class="fa fa-arrow-down"></i></a>
</td>
<td class="text-right flip">
<td class="text-right flip col-actions">
<a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}" class="btn btn-default btn-sm"><i class="fa fa-edit"></i></a>
<a href="{% url "control:event.items.add" organizer=request.event.organizer.slug event=request.event.slug %}?copy_from={{ i.id }}" class="btn btn-default btn-sm" title="{% trans "Clone" %}" data-toggle="tooltip"><i class="fa fa-copy"></i></a>
<a href="{% url "control:event.items.delete" organizer=request.event.organizer.slug event=request.event.slug item=i.id %}" class="btn btn-danger btn-sm"><i class="fa fa-trash"></i></a>

11
src/pretix/control/views/typeahead.py
View File

@@ -583,17 +583,17 @@ def itemvarquota_select2(request, **kwargs):
if variations:
choices.append((str(i.pk), _('{product} – Any variation').format(product=i), ''))
for v in variations:
choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (i, v.value), ''))
choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (i, v.value), '', not i.active))
else:
choices.append((str(i.pk), str(i), ''))
choices.append((str(i.pk), str(i), '', not i.active))
for q in quotaqs:
if request.event.has_subevents:
choices.append(('q-%d' % q.pk,
_('Any product in quota "{quota}"').format(
quota=q
), str(q.subevent)))
), str(q.subevent), False))
else:
choices.append(('q-%d' % q.pk, _('Any product in quota "{quota}"').format(quota=q), ''))
choices.append(('q-%d' % q.pk, _('Any product in quota "{quota}"').format(quota=q), '', False))
doc = {
'results': [
@@ -601,8 +601,9 @@ def itemvarquota_select2(request, **kwargs):
'id': k,
'text': str(v),
'event': str(t),
'inactive': d
}
for k, v, t in choices
for k, v, t, d in choices
],
'pagination': {
"more": more

8
src/pretix/static/pretixbase/scss/_theme.scss
View File

@@ -184,6 +184,14 @@ svg.svg-icon {
top: 2px;
}
.link-muted a, a.link-muted {
color: $text-muted;
}
.row-muted td:not(.col-actions) {
opacity: 0.7;
}
@include table-row-variant('success', lighten($brand-success, 40%));
@include table-row-variant('info', lighten($brand-info, 30%));
@include table-row-variant('warning', lighten($brand-warning, 40%));

2
src/pretix/static/pretixcontrol/js/ui/main.js
View File

@@ -483,7 +483,7 @@ var form_handlers = function (el) {
return res.text;
}
var $ret = $("<span>").append(
$("<span>").addClass("primary").append($("<div>").text(res.text).html())
$(res.inactive ? "<strike class='text-muted'>" : "<span>").addClass("primary").append($("<div>").text(res.text).html())
);
if (res.event) {
$ret.append(

1
src/pretix/static/pretixpresale/scss/_theme.scss
View File

@@ -60,6 +60,7 @@
h2.content-header {
margin-top: 0;
}
@media (max-width: $screen-xs-max) {
h2.content-header small {
display: block;