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 #11478 from rainzm/notify/distinct

Browse Source 
fix(notify): distinct field of receivers
This commit is contained in:
Zexi Li
2021-06-24 20:14:25 +08:00
committed by GitHub
parent 2d77a1a048 1c865268f8
commit 1766549f2d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/notify/models/receiver.go
+5 -5
View File
@@ -732,14 +732,14 @@ func (rm *SReceiverManager) FetchCustomizeColumns(ctx context.Context, userCred
func (rm *SReceiverManager) QueryDistinctExtraField(q *sqlchemy.SQuery, field string) (*sqlchemy.SQuery, error) {
q, err := rm.SStatusStandaloneResourceBaseManager.QueryDistinctExtraField(q, field)
if err != nil {
return nil, err
if err == nil {
return q, nil
}
q, err = rm.SDomainizedResourceBaseManager.QueryDistinctExtraField(q, field)
if err != nil {
return nil, err
if err == nil {
return q, nil
}
return q, nil
return q, httperrors.ErrNotFound
}
func (rm *SReceiverManager) OrderByExtraFields(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, query api.ReceiverListInput) (*sqlchemy.SQuery, error) {