Compare commits

...

3 Commits

Author SHA1 Message Date
6406580385 added call to make.eldorado.srsoftware.de
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 3m7s
Build Docker Image / Clean-Registry (push) Successful in 1s
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
2026-01-05 23:15:50 +01:00
562c854a5b Merge branch 'bugfix/doc_template' into dev
All checks were successful
Build Docker Image / Docker-Build (push) Successful in 2m35s
Build Docker Image / Clean-Registry (push) Successful in 2s
2026-01-05 10:35:51 +01:00
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
3 changed files with 8 additions and 3 deletions

View File

@@ -41,6 +41,11 @@ jobs:
docker push ${{ secrets.REGISTRY_PATH }}/umbrella:${{ gitea.ref_name }}
docker push ${{ secrets.REGISTRY_PATH }}/umbrella:$TAG
- name: Restart umbrella.srsoftware.de
if: github.ref == 'refs/heads/dev'
run: |
curl -X POST -H "Authorization: Bearer ${{ secrets.ELDORADO_MAKE_BEARER }}" -d umbrella_25_start https://make.eldorado.srsoftware.de/launch
Clean-Registry:
runs-on: ubuntu-latest
steps:

View File

@@ -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

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 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);