opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-01 15:07:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(notify): add list option 'enabled' for topic

Browse Source
This commit is contained in:
rainzm
2021-08-03 17:12:11 +08:00
parent 3dea565c8a
commit c89ae949e0
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/notify/topic.go
+1
View File
@@ -18,6 +18,7 @@ import "yunion.io/x/onecloud/pkg/apis"
type TopicListInput struct {
apis.StandaloneResourceListInput
apis.EnabledResourceBaseListInput
}
type TopicDetails struct {
pkg/notify/models/topic.go
+9 -1
View File
@@ -228,7 +228,15 @@ func (sm *STopicManager) InitializeData() error {
}
func (sm *STopicManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, input notify.TopicListInput) (*sqlchemy.SQuery, error) {
return sm.SStandaloneResourceBaseManager.ListItemFilter(ctx, q, userCred, input.StandaloneResourceListInput)
q, err := sm.SStandaloneResourceBaseManager.ListItemFilter(ctx, q, userCred, input.StandaloneResourceListInput)
if err != nil {
return nil, errors.Wrap(err, "SStandaloneResourceBaseManager.ListItemFilter")
}
q, err = sm.SEnabledResourceBaseManager.ListItemFilter(ctx, q, userCred, input.EnabledResourceBaseListInput)
if err != nil {
return nil, errors.Wrap(err, "SEnabledResourceBaseManager.ListItemFilter")
}
return q, nil
}
func (sm *STopicManager) FetchCustomizeColumns(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, objs []interface{}, fields stringutils2.SSortedStrings, isList bool) []notify.TopicDetails {