fix: separate private cloud & on-premise

This commit is contained in:
Qiu Jian
2019-03-19 22:14:01 +08:00
parent 4922d3a876
commit 99a10db949
3 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -140,7 +140,7 @@ func GetPublicProviders() []string {
func GetPrivateProviders() []string {
providers := make([]string, 0)
for p, d := range providerTable {
if !d.IsPublicCloud() {
if !d.IsPublicCloud() && !d.IsOnPremise() {
providers = append(providers, p)
}
}
+1 -1
View File
@@ -889,7 +889,7 @@ func (manager *SCloudaccountManager) ListItemFilter(ctx context.Context, q *sqlc
}
if jsonutils.QueryBoolean(query, "private_cloud", false) {
q = q.IsFalse("is_public_cloud")
q = q.IsFalse("is_public_cloud").IsFalse("is_on_premise")
}
if jsonutils.QueryBoolean(query, "is_on_premise", false) {
+1
View File
@@ -840,6 +840,7 @@ func (manager *SCloudproviderManager) ListItemFilter(ctx context.Context, q *sql
cloudaccounts := CloudaccountManager.Query().SubQuery()
q = q.Join(cloudaccounts, sqlchemy.Equals(cloudaccounts.Field("id"), q.Field("cloudaccount_id")))
q = q.Filter(sqlchemy.IsFalse(cloudaccounts.Field("is_public_cloud")))
q = q.Filter(sqlchemy.IsFalse(cloudaccounts.Field("is_on_premise")))
}
if jsonutils.QueryBoolean(query, "is_on_premise", false) {