SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Compare commits

base: SRSoftware:73994d3a4ec5a32c42f13c7c60f6a733999e46a4
Branches Tags
SRSoftware:main SRSoftware:module/journal SRSoftware:dev SRSoftware:workflow SRSoftware:feature/workflow SRSoftware:module/messagebus SRSoftware:feature/backend_translation SRSoftware:bugfix/scroll_dont_click SRSoftware:bugfix/timetrack-buttons SRSoftware:bugfix/add_task_from_kanban SRSoftware:css/stock SRSoftware:feature/tile_menu SRSoftware:feature/live_price_update SRSoftware:feature/stock_search SRSoftware:feature/items_stock_integration SRSoftware:feature/task_easy_list SRSoftware:feature/kanban_button SRSoftware:module/contact SRSoftware:module/tasks SRSoftware:feature/list_task_users SRSoftware:module/projects SRSoftware:module/stock SRSoftware:module/document SRSoftware:module/files SRSoftware:module/timetracking SRSoftware:module/wiki SRSoftware:feature/filter_task_list SRSoftware:code-review SRSoftware:module/notes SRSoftware:kanban SRSoftware:feature/document
...
compare: SRSoftware:562c854a5b9d451f5532127b510c6e1aedbfbdc9
Branches Tags
SRSoftware:module/journal SRSoftware:dev SRSoftware:main SRSoftware:workflow SRSoftware:feature/workflow SRSoftware:module/messagebus SRSoftware:feature/backend_translation SRSoftware:bugfix/scroll_dont_click SRSoftware:bugfix/timetrack-buttons SRSoftware:bugfix/add_task_from_kanban SRSoftware:css/stock SRSoftware:feature/tile_menu SRSoftware:feature/live_price_update SRSoftware:feature/stock_search SRSoftware:feature/items_stock_integration SRSoftware:feature/task_easy_list SRSoftware:feature/kanban_button SRSoftware:module/contact SRSoftware:module/tasks SRSoftware:feature/list_task_users SRSoftware:module/projects SRSoftware:module/stock SRSoftware:module/document SRSoftware:module/files SRSoftware:module/timetracking SRSoftware:module/wiki SRSoftware:feature/filter_task_list SRSoftware:code-review SRSoftware:module/notes SRSoftware:kanban SRSoftware:feature/document

2 Commits
73994d3a4e ... 562c854a5b

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
2 changed files with 3 additions and 3 deletions
Expand all files Collapse all files

4
Dockerfile
View File

@@ -1,5 +1,5 @@
FROM alpine:3.22 AS svelte_build FROM alpine:3.22 AS svelte_build
RUN apk add bash git npm RUN apk add npm
RUN adduser -Dh /home/svelte svelte RUN adduser -Dh /home/svelte svelte
ADD . /home/svelte/Umbrella ADD . /home/svelte/Umbrella
RUN chown -R svelte /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 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 ADD . /Umbrella
WORKDIR /Umbrella WORKDIR /Umbrella
COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web

2
core/src/main/java/de/srsoftware/umbrella/core/model/Document.java
View File

@@ -207,7 +207,7 @@ public final class Document implements Mappable {
case SENDER: if (json.get(key) instanceof JSONObject nested) sender.patch(nested); break; 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 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 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; default: key = null;
} }
if (key != null) dirtyFields.add(key); if (key != null) dirtyFields.add(key);