1.4.2

Merge pull request 'patches v1.4.2' (#91 ) from develop into main
Reviewed-on: #91
2025-04-18 11:10:45 +02:00 · 2025-04-18 09:10:13 +00:00 · 2025-04-18 09:09:40 +00:00 · 2025-04-17 13:41:04 +02:00
3 changed files with 8 additions and 8 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
  "name": "ff-admin-server",
-  "version": "1.4.1",
+  "version": "1.4.2",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "ff-admin-server",
-      "version": "1.4.1",
+      "version": "1.4.2",
      "license": "AGPL-3.0-only",
      "dependencies": {
        "cors": "^2.8.5",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "ff-admin-server",
-  "version": "1.4.1",
+  "version": "1.4.2",
  "description": "Feuerwehr/Verein Mitgliederverwaltung Server",
  "main": "dist/index.js",
  "scripts": {
--- a/src/helpers/backupHelper.ts
+++ b/src/helpers/backupHelper.ts
@ -755,11 +755,11 @@ export default abstract class BackupHelper {
      .filter((d) => availableTemplates.includes(d.scope))
      .map((d) => ({
        ...d,
-        headerHeightId: templates.find((template) => template.template == d.headerHeight.template)?.id ?? null,
-        footerHeightId: templates.find((template) => template.template == d.footerHeight.template)?.id ?? null,
-        headerId: templates.find((template) => template.template == d.header.template)?.id ?? null,
-        bodyId: templates.find((template) => template.template == d.body.template)?.id ?? null,
-        footerId: templates.find((template) => template.template == d.footer.template)?.id ?? null,
+        headerHeightId: templates.find((template) => template.template == d.headerHeight)?.id ?? null,
+        footerHeightId: templates.find((template) => template.template == d.footerHeight)?.id ?? null,
+        headerId: templates.find((template) => template.template == d.header?.template)?.id ?? null,
+        bodyId: templates.find((template) => template.template == d.body?.template)?.id ?? null,
+        footerId: templates.find((template) => template.template == d.footer?.template)?.id ?? null,
      }));
    availableTemplates.forEach((at) => {
      if (!dataWithMappedId.some((d) => d.scope == at)) {
Author	SHA1	Message	Date
Julian Krauser	fa5e778d0c	1.4.2	2025-04-18 11:10:45 +02:00
Julian Krauser	c2c782985c	Merge pull request 'patches v1.4.2' (#91 ) from develop into main Reviewed-on: #91	2025-04-18 09:10:13 +00:00
Julian Krauser	57848ff29b	Merge branch 'main' into develop	2025-04-18 09:09:40 +00:00
Julian Krauser	3a956919b2	hotfix: template backup restore	2025-04-17 13:41:04 +02:00