opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9922 from rainzm/notify/mobile_lang

Browse Source 
fix(notify): remote 'lang' filter when contact type is 'mobile'
This commit is contained in:
Zexi Li
2021-01-18 10:24:00 +08:00
committed by GitHub
parent c31368c41b 9db54d1dd1
commit e1f4e8f12c
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/notify/models/template.go
+8 -1
View File
@@ -237,7 +237,14 @@ func (tm *STemplateManager) NotifyFilter(contactType, topic, msg, lang string) (
return
}
templates := make([]STemplate, 0, 3)
q := tm.Query().Equals("topic", strings.ToUpper(topic)).Equals("lang", lang).In("contact_type", []string{CONTACTTYPE_ALL, contactType})
var q *sqlchemy.SQuery
if contactType == api.MOBILE {
// hack
// ingore lang when contactType is mobile
q = tm.Query().Equals("topic", strings.ToUpper(topic)).In("contact_type", []string{CONTACTTYPE_ALL, contactType})
} else {
q = tm.Query().Equals("topic", strings.ToUpper(topic)).Equals("lang", lang).In("contact_type", []string{CONTACTTYPE_ALL, contactType})
}
err = db.FetchModelObjects(tm, q, &templates)
if errors.Cause(err) == sql.ErrNoRows || len(templates) == 0 {
// no such template, return as is