Merge pull request #1007 from adfinis/main

Next staging
adfinis · Feb 8, 2024 · 7d7582f · 7d7582f
2 parents 0d9dde0 + f46a44d
commit 7d7582f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -85,15 +85,15 @@ docker compose up -d
 # Wait for the database migrations to complete for the API and Caluma.
 make caluma-loadconfig
 # upload the templates to DMS
-docker compose run --rm api python manage.py upload_template -t mysagw/identity/templates/identity-labels.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/accounting/templates/accounting-cover.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/case/templates/acknowledgement-de.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/case/templates/acknowledgement-fr.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/case/templates/acknowledgement-en.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/case/templates/credit-approval-de.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/case/templates/credit-approval-fr.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/case/templates/credit-approval-en.docx
-docker compose run --rm api python manage.py upload_template -t mysagw/case/templates/application.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/identity/templates/identity-labels.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/accounting/templates/accounting-cover.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/case/templates/acknowledgement-de.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/case/templates/acknowledgement-fr.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/case/templates/acknowledgement-en.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/case/templates/credit-approval-de.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/case/templates/credit-approval-fr.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/case/templates/credit-approval-en.docx
+docker compose run --rm api poetry run ./manage.py upload_template -t mysagw/case/templates/application.docx
 ```
 
 ## Contributing

diff --git a/api/mysagw/case/templates/application.docx b/api/mysagw/case/templates/application.docx
diff --git a/caluma/Dockerfile b/caluma/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/projectcaluma/caluma:9.3.2
+FROM ghcr.io/projectcaluma/caluma:10.1.0
 
 ENV PATH="${HOME}/.local/bin:${PATH}"
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - db
 
   caluma:
-    image: ghcr.io/projectcaluma/caluma:9.3.2
+    image: ghcr.io/projectcaluma/caluma:10.1.0
     build:
       context: caluma
     environment:

diff --git a/ember/app/services/case-data.js b/ember/app/services/case-data.js
@@ -19,7 +19,7 @@ export default class CaseDataService extends Service {
     const caseEdges = yield this.apollo.query(
       {
         query: getCaseQuery,
-        variables: { filter: [{ id: caseId }] },
+        variables: { filter: [{ ids: [caseId] }] },
         fetchPolicy: "network-only",
       },
       "allCases.edges"

diff --git a/ember/app/ui/cases/detail/index/controller.js b/ember/app/ui/cases/detail/index/controller.js
@@ -284,7 +284,7 @@ export default class CasesDetailIndexController extends Controller {
     const caseEdges = yield this.apollo.query(
       {
         query: getCaseQuery,
-        variables: { filter: [{ id: this.model.id }] },
+        variables: { filter: [{ ids: [this.model.id] }] },
       },
       "allCases.edges"
     );