admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2022-11-10 (pull request #618)

Browse Source 
release/2022-11-10

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2022-11-08 18:35:58 +00:00
parent 60fa40f738 3fa38822f3
commit 9a04c63f72
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.circleci/config.yml
View File

@@ -32,9 +32,9 @@ jobs:
name: Execute migration name: Execute migration
command: | command: |
npm install hasura-cli -g npm install hasura-cli -g
hasura migrate apply --endpoint https://db.imex.online/ --admin-secret $HASURA_PROD_SECRET hasura migrate apply --endpoint https://db.imex.online/ --admin-secret ${HASURA_PROD_SECRET}
hasura metadata apply --endpoint https://db.imex.online/ --admin-secret $HASURA_PROD_SECRET hasura metadata apply --endpoint https://db.imex.online/ --admin-secret ${HASURA_PROD_SECRET}
hasura metadata reload --endpoint https://db.imex.online/ --admin-secret $HASURA_PROD_SECRET hasura metadata reload --endpoint https://db.imex.online/ --admin-secret ${HASURA_PROD_SECRET}
app-build: app-build:
docker: docker:
@@ -78,9 +78,9 @@ jobs:
name: Execute migration name: Execute migration
command: | command: |
npm install hasura-cli -g npm install hasura-cli -g
hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret $HASURA_TEST_SECRET hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret ${HASURA_TEST_SECRET}
hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret $HASURA_TEST_SECRET hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret ${HASURA_TEST_SECRET}
hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret $HASURA_TEST_SECRET hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret ${HASURA_TEST_SECRET}
test-app-build: test-app-build:
docker: docker:

2
client/src/utils/TemplateConstants.js
View File

@@ -1692,7 +1692,7 @@ export const TemplateList = (type, context) => {
object: i18n.t("reportcenter.labels.objects.jobs"), object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.actual_completion"), field: i18n.t("jobs.fields.actual_completion"),
}, },
group: "job", group: "jobs",
}, },
} }
: {}), : {}),