Compare commits

..
Author SHA1 Message Date
Richard Schreiber 4087cdf536 fix flake8 2026-10-01 15:27:03 +02:00
Richard Schreiber 4b9d091ef2 Update vouchers.py 2026-10-01 08:47:21 +02:00
Richard Schreiber ef76b18586 Fix voucher batch-import handling missing email column in row 2026-09-30 13:59:37 +02:00
Richard Schreiber 3dd8cc5862 PDF Editor: select newly created element after insert (#6596)
* PDF Editor: select newly created element after insert

* Do not create so many savepoints
2026-09-30 12:19:03 +02:00
dependabot[bot] 23e9ca8f34 Bump brace-expansion (#6625)
Bumps  and [brace-expansion](https://github.com/juliangruber/brace-expansion). These dependencies needed to be updated together.

Updates `brace-expansion` from 5.0.4 to 5.0.12
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/v5.0.4...v5.0.12)

Updates `brace-expansion` from 2.0.2 to 2.1.7
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/v5.0.4...v5.0.12)

---
updated-dependencies:
- dependency-name: brace-expansion
  dependency-version: 5.0.12
  dependency-type: indirect
- dependency-name: brace-expansion
  dependency-version: 2.1.7
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-09-30 10:53:41 +02:00
Raphael Michel e19afd39fb Bump version to 2026.9.0.dev0 2026-09-30 10:50:09 +02:00
4 changed files with 36 additions and 26 deletions
+15 -15
View File
@@ -194,16 +194,16 @@
}
},
"node_modules/@eslint/config-array/node_modules/brace-expansion": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
"integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
"version": "5.0.12",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
"integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"balanced-match": "^4.0.2"
},
"engines": {
"node": "18 || 20 || >=22"
"node": "20 || >=22"
}
},
"node_modules/@eslint/config-array/node_modules/minimatch": {
@@ -1339,16 +1339,16 @@
}
},
"node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
"integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
"version": "5.0.12",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
"integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"balanced-match": "^4.0.2"
},
"engines": {
"node": "18 || 20 || >=22"
"node": "20 || >=22"
}
},
"node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
@@ -1697,9 +1697,9 @@
"license": "ISC"
},
"node_modules/brace-expansion": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
"integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
"version": "2.1.7",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.7.tgz",
"integrity": "sha512-uZbew1NqdmPDTMJ8ah1y+b+9QEJrfkXFk3RcTQw3X0jW/xRUvFKsg1CfQdSYGdTbXZWExtU3J3ccxtnfw1Fi0g==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -2122,16 +2122,16 @@
}
},
"node_modules/eslint/node_modules/brace-expansion": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.4.tgz",
"integrity": "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==",
"version": "5.0.12",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
"integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"balanced-match": "^4.0.2"
},
"engines": {
"node": "18 || 20 || >=22"
"node": "20 || >=22"
}
},
"node_modules/eslint/node_modules/eslint-visitor-keys": {
+1 -1
View File
@@ -19,4 +19,4 @@
# You should have received a copy of the GNU Affero General Public License along with this program. If not, see
# <https://www.gnu.org/licenses/>.
#
__version__ = "2026.8.0"
__version__ = "2026.9.0.dev0"
+14 -3
View File
@@ -615,9 +615,15 @@ class VoucherBulkForm(VoucherForm):
raise ValidationError(_('CSV input contains an unknown field with the header "{header}".').format(header=unknown_fields[0]))
for i, row in enumerate(reader):
try:
EmailValidator()(row['email'].strip())
EmailValidator()((row['email'] or '').strip())
except ValidationError as err:
raise ValidationError(_('{value} is not a valid email address.').format(value=row['email'].strip())) from err
raise ValidationError(
_('Invalid email address ({email}) in row {number} ({value}).').format(
number=i + 1,
value=', '.join(row.values()),
email=row['email'] or _('empty column'),
)
) from err
try:
res.append(self.Recipient(
name=row.get('name', ''),
@@ -626,7 +632,12 @@ class VoucherBulkForm(VoucherForm):
tag=row.get('tag', None)
))
except ValueError as err:
raise ValidationError(_('Invalid value in row {number}.').format(number=i + 1)) from err
raise ValidationError(
_('Invalid value ({value}) in row {number}.').format(
number=i + 1,
value=escape(', '.join(row.values())),
)
) from err
else:
for e in r:
try:
@@ -556,8 +556,6 @@ var editor = {
editor.$fcv.get(0).height = editor.pdf_viewport.height
editor.fabric = new fabric.Canvas('fabric-canvas')
editor.fabric.on('object:modified', editor._create_savepoint)
editor.fabric.on('object:added', editor._create_savepoint)
editor.fabric.on('selection:cleared', editor._update_toolbox)
editor.fabric.on('selection:created', editor._update_toolbox)
editor.fabric.on('selection:updated', editor._update_toolbox)
@@ -590,6 +588,12 @@ var editor = {
if (editor._window_loaded) {
editor._ready()
}
editor.fabric.on('object:modified', editor._create_savepoint)
editor.fabric.on('object:added', editor._create_savepoint)
editor.fabric.on('object:added', function(e) {
editor.fabric.setActiveObject(e.target);
})
},
_window_load_event: function () {
@@ -956,7 +960,6 @@ var editor = {
mtr: true
})
editor.fabric.add(text)
editor._create_savepoint()
return text
},
@@ -972,7 +975,6 @@ var editor = {
rect.scaleToHeight(126)
rect.setControlsVisibility({ mtr: false, mb: false, mt: false, mr: false, ml: false })
editor.fabric.add(rect)
editor._create_savepoint()
return rect
},
@@ -1009,7 +1011,6 @@ var editor = {
mtr: true
})
editor.fabric.add(rect)
editor._create_savepoint()
$('#version-notice').show()
return rect
},
@@ -1026,7 +1027,6 @@ var editor = {
})
rect.setControlsVisibility({ mtr: false })
editor.fabric.add(rect)
editor._create_savepoint()
return rect
},
@@ -1044,7 +1044,6 @@ var editor = {
})
rect.setControlsVisibility({ mtr: false, mb: false, mt: false, mr: false, ml: false })
editor.fabric.add(rect)
editor._create_savepoint()
return rect
},