TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2024-12-12 02:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: custom mail texts (#2101)

Browse Source 
* fix: custom mail texts

* fix: custom mail texts

* disable cache

* enable cache again

* disable cache again

* comment
This commit is contained in:
Livio Amstutz 2021-07-29 14:29:09 +02:00 committed by GitHub
parent 7d3c768d8b
commit de9f88bf5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/zitadel.yml vendored
View File

@ -72,7 +72,7 @@ jobs:
context: .
file: ./build/zitadel/Dockerfile
platforms: linux/amd64
cache-from: type=gha,scope=${{ github.workflow }}
# cache-from: type=gha,scope=${{ github.workflow }} (https://github.com/caos/zitadel/issues/2102)
cache-to: type=gha,scope=${{ github.workflow }},mode=max
outputs: type=local,dest=/tmp/zitadel
- uses: actions/upload-artifact@v2
@ -124,7 +124,7 @@ jobs:
context: .
file: ./build/console/Dockerfile
platforms: linux/amd64
cache-from: type=gha,scope=${{ github.workflow }}
# cache-from: type=gha,scope=${{ github.workflow }} (https://github.com/caos/zitadel/issues/2102)
cache-to: type=gha,scope=${{ github.workflow }},mode=max
outputs: type=local,dest=/tmp/zitadel-console
- uses: actions/upload-artifact@v2
@ -194,7 +194,7 @@ jobs:
context: .
file: ./build/operator/Dockerfile
platforms: linux/amd64
cache-from: type=gha,scope=${{ matrix.goos }}-${{ matrix.goarch }}
# cache-from: type=gha,scope=${{ matrix.goos }}-${{ matrix.goarch }} (https://github.com/caos/zitadel/issues/2102)
cache-to: type=gha,scope=${{ matrix.goos }}-${{ matrix.goarch }},mode=max
outputs: type=local,dest=/tmp/operator
build-args: |

6
internal/notification/repository/eventsourcing/handler/notification.go
View File

@ -398,18 +398,18 @@ func (n *Notification) getTranslatorWithOrgTexts(orgID, textType string) (*i18n.
return nil, err
}
allCustomTexts, err := n.view.CustomTextsByAggregateIDAndTemplate(domain.IAMID, textType)
if err == nil {
if err != nil {
return translator, nil
}
customTexts, err := n.view.CustomTextsByAggregateIDAndTemplate(orgID, textType)
if err == nil {
if err != nil {
return translator, nil
}
allCustomTexts = append(allCustomTexts, customTexts...)
for _, text := range allCustomTexts {
msg := i18n.Message{
ID: text.Key,
ID: text.Template + "." + text.Key,
Text: text.Text,
}
translator.AddMessages(language.Make(text.Language), msg)