Merge branch 'bugfix/doc_template' into dev

bugfix: altered patch key for updating template in document
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-05 10:35:51 +01:00 · 2026-01-05 10:34:42 +01:00 · 2026-01-05 08:49:30 +01:00 · 2026-01-03 23:55:31 +01:00 · 2026-01-03 22:17:39 +01:00 · 2026-01-03 22:17:30 +01:00
2 changed files with 3 additions and 3 deletions
--- a/4
+++ b/4
@@ -1,5 +1,5 @@
 FROM alpine:3.22 AS svelte_build
-RUN apk add bash git npm
+RUN apk add npm
 RUN adduser -Dh /home/svelte svelte
 ADD . /home/svelte/Umbrella
 RUN chown -R svelte /home/svelte/Umbrella
@@ -9,7 +9,7 @@ RUN npm install && npm run build


 FROM alpine AS java_build
-RUN apk add bash git gradle fontconfig font-opensans openjdk21-jre
+RUN apk add gradle fontconfig font-opensans openjdk21-jre
 ADD . /Umbrella
 WORKDIR /Umbrella
 COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web
--- a/core/src/main/java/de/srsoftware/umbrella/core/model/Document.java
+++ b/core/src/main/java/de/srsoftware/umbrella/core/model/Document.java
@@ -207,7 +207,7 @@ public final class Document implements Mappable {
 				case SENDER:         if (json.get(key) instanceof JSONObject nested) sender.patch(nested); break;
 				case STATE:          state = State.of(json.getInt(key)).orElseThrow(() -> new UmbrellaException(HTTP_UNPROCESSABLE,"Invalid state")); break;
 				case POS:      if (json.get(key) instanceof JSONObject nested) positions.patch(nested); break;
-				case TEMPLATE_ID: if (json.get(key) instanceof String templateId) template = templateId; break;
+				case TEMPLATE: if (json.get(key) instanceof String templateId) template = templateId; break;
 				default:             key = null;
 			}
 			if (key != null) dirtyFields.add(key);
Author	SHA1	Message	Date
Stephan Richter	562c854a5b	Merge branch 'bugfix/doc_template' into dev All checks were successful Build Docker Image / Docker-Build (push) Successful in 2m35s Details Build Docker Image / Clean-Registry (push) Successful in 2s Details	2026-01-05 10:35:51 +01:00
Stephan Richter	f4adf2ca3c	bugfix: altered patch key for updating template in document Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-05 10:34:42 +01:00
Stephan Richter	73994d3a4e	Merge branch 'bugfix/time_filtered_by_prj' into dev All checks were successful Build Docker Image / Docker-Build (push) Successful in 2m40s Details Build Docker Image / Clean-Registry (push) Successful in 3s Details	2026-01-05 08:49:30 +01:00
Stephan Richter	ac2f974e5a	Merge branch 'workflow' into dev All checks were successful Build Docker Image / Docker-Build (push) Successful in 2m31s Details Build Docker Image / Clean-Registry (push) Successful in 3s Details	2026-01-03 23:55:31 +01:00
Stephan Richter	cd25d23246	Merge branch 'feature/workflow' into dev All checks were successful Build Docker Image / Docker-Build (push) Successful in 2m40s Details	2026-01-03 22:17:39 +01:00
Stephan Richter	8d2f3ef88e	fixed tagging Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 22:17:30 +01:00
Stephan Richter	8e53d3b306	Merge branch 'feature/workflow' into dev All checks were successful Build Docker Image / Docker-Build (push) Successful in 41s Details	2026-01-03 22:14:28 +01:00
Stephan Richter	bd95c3d0c4	debugging Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 22:14:22 +01:00
Stephan Richter	421a350f57	Merge branch 'feature/workflow' into dev Some checks failed Build Docker Image / Docker-Build (push) Has been cancelled Details	2026-01-03 22:13:31 +01:00
Stephan Richter	dceb84669b	debugging Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 22:13:21 +01:00
Stephan Richter	eaeb625d51	Merge branch 'feature/workflow' into dev Some checks failed Build Docker Image / Docker-Build (push) Failing after 2m32s Details	2026-01-03 22:03:10 +01:00
Stephan Richter	e980dbf884	working on tag creation Signed-off-by: Stephan Richter <s.richter@srsoftware.de>	2026-01-03 22:03:04 +01:00
Stephan Richter	dfa991b90a	Merge branch 'feature/workflow' into dev Some checks failed Build Docker Image / Docker-Build (push) Failing after 2m31s Details	2026-01-03 21:41:56 +01:00
Stephan Richter	3b40250488	Merge branch 'feature/workflow' into dev Some checks failed Build Docker Image / Docker-Build (push) Failing after 2m29s Details	2026-01-03 21:37:50 +01:00
Stephan Richter	8e8992f534	Merge branch 'feature/workflow' into dev All checks were successful Build Docker Image / Docker-Build (push) Successful in 2m39s Details	2026-01-03 21:32:59 +01:00
Stephan Richter	076efda195	Merge branch 'feature/workflow' into dev Some checks failed Build Docker Image / Docker-Build (push) Failing after 2m46s Details	2026-01-03 21:23:29 +01:00
Stephan Richter	5c1e802a6f	Merge branch 'feature/workflow' into dev All checks were successful Build Docker Image / Docker-Build (push) Successful in 2m42s Details	2026-01-03 21:13:42 +01:00
Stephan Richter	750e0f16e1	Merge branch 'feature/workflow' into dev Some checks failed Build Docker Image / Docker-Build (push) Failing after 2m43s Details	2026-01-03 21:07:38 +01:00
Stephan Richter	c06083476f	Merge branch 'feature/workflow' into dev Some checks failed Build Docker Image / Docker-Build (push) Failing after 0s Details	2026-01-03 21:06:39 +01:00
Stephan Richter	f784ec6109	Merge branch 'main' into dev	2025-12-28 14:10:06 +01:00