From c89ae949e019197fb15bf3dc13b44e342acd71d0 Mon Sep 17 00:00:00 2001
From: rainzm <mjoycarry@gmail.com>
Date: Tue, 3 Aug 2021 17:12:11 +0800
Subject: [PATCH] fix(notify): add list option 'enabled' for topic

---
 pkg/apis/notify/topic.go   |  1 +
 pkg/notify/models/topic.go | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkg/apis/notify/topic.go b/pkg/apis/notify/topic.go
index 024ad1c0b0..b0c327c854 100644
--- a/pkg/apis/notify/topic.go
+++ b/pkg/apis/notify/topic.go
@@ -18,6 +18,7 @@ import "yunion.io/x/onecloud/pkg/apis"
 
 type TopicListInput struct {
 	apis.StandaloneResourceListInput
+	apis.EnabledResourceBaseListInput
 }
 
 type TopicDetails struct {
diff --git a/pkg/notify/models/topic.go b/pkg/notify/models/topic.go
index bcfa6da62d..4c5b22edcb 100644
--- a/pkg/notify/models/topic.go
+++ b/pkg/notify/models/topic.go
@@ -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 {