Compare commits

..

3 Commits

Author SHA1 Message Date
Raphael Michel
1752e2a9db Order change: Fix list of unchangeable add-ons not filtered to category (Z#23223330) 2026-02-05 15:26:11 +01:00
Raphael Michel
dc49d5bcf7 Add "scheduling" to banned organizer slugs 2026-02-03 12:51:48 +01:00
Richard Schreiber
d4460045b4 Fix mail headers being None (#5873)
* Fix mail headers being None

* update tests
2026-02-03 11:26:26 +01:00
4 changed files with 7 additions and 9 deletions

View File

@@ -95,6 +95,7 @@ class OrganizerSlugBanlistValidator(BanlistValidator):
'csp_report',
'widget',
'lead',
'scheduling',
]

View File

@@ -1510,7 +1510,10 @@ class OrderChangeMixin:
'max_count': iao.max_count,
'iao': iao,
'items': [i for i in items if not i.require_voucher],
'items_missing': {k: v for k, v in current_addon_products_missing.items() if v},
'items_missing': {
k: v for k, v in current_addon_products_missing.items()
if v and k[0].category_id == iao.addon_category_id
},
})
return positions

View File

@@ -674,11 +674,10 @@ var editor = {
$("#toolbox").find("button[data-action=middle]").toggleClass('active', o.verticalAlign === 'middle');
$("#toolbox").find("button[data-action=bottom]").toggleClass('active', o.verticalAlign === 'bottom');
console.log("_update_toolbox_values", o.scaleY, o.scaleX)
if (o.scaleY !== 1 || o.scaleX !== 1) {
o.set({
height: Math.max(o.height * o.scaleY, editor._mm2px(10.01)),
width: Math.max(o.width * o.scaleX, editor._mm2px(10.01)),
height: o.height * o.scaleY,
width: o.width * o.scaleX,
scaleX: 1,
scaleY: 1
});

View File

@@ -170,7 +170,6 @@ def test_queue_state_sent(env):
subject='Test',
body_plain='Test',
sender='sender@example.com',
headers={},
)
assert m.status == OutgoingMail.STATUS_QUEUED
mail_send_task.apply(kwargs={
@@ -188,7 +187,6 @@ def test_queue_state_permanent_failure(env):
subject='Test',
body_plain='Test',
sender='sender@example.com',
headers={},
)
assert m.status == OutgoingMail.STATUS_QUEUED
mail_send_task.apply(kwargs={
@@ -210,7 +208,6 @@ def test_queue_state_retry_failure(env, monkeypatch):
subject='Test',
body_plain='Test',
sender='sender@example.com',
headers={},
)
assert m.status == OutgoingMail.STATUS_QUEUED
mail_send_task.apply(kwargs={
@@ -236,7 +233,6 @@ def test_queue_state_foreign_key_handling():
subject='Test',
body_plain='Test',
sender='sender@example.com',
headers={},
)
mail_sent = OutgoingMail.objects.create(
organizer=o,
@@ -245,7 +241,6 @@ def test_queue_state_foreign_key_handling():
subject='Test',
body_plain='Test',
sender='sender@example.com',
headers={},
status=OutgoingMail.STATUS_SENT,
)