diff --git a/pkg/cloudcommon/db/sharablebase.go b/pkg/cloudcommon/db/sharablebase.go index 1b0d523342..32aa8a4ece 100644 --- a/pkg/cloudcommon/db/sharablebase.go +++ b/pkg/cloudcommon/db/sharablebase.go @@ -219,7 +219,7 @@ func SharableManagerFilterByOwner(ctx context.Context, manager IStandaloneModelM resScope := manager.ResourceScope() if resScope == rbacscope.ScopeUser { targetProjectId := owner.GetProjectId() - if len(targetProjectId) == 0 { + if len(targetProjectId) == 0 && userCred != nil { targetProjectId = userCred.GetProjectId() } subq := SharedResourceManager.Query("resource_id") diff --git a/pkg/compute/models/keypairs.go b/pkg/compute/models/keypairs.go index 657294768a..eb200c2127 100644 --- a/pkg/compute/models/keypairs.go +++ b/pkg/compute/models/keypairs.go @@ -289,11 +289,6 @@ func (self *SKeypair) ValidateDeleteCondition(ctx context.Context, info *api.Key return self.SStandaloneResourceBase.ValidateDeleteCondition(ctx, nil) } -func totalKeypairCount(userId string) (int, error) { - q := KeypairManager.Query().Equals("owner_id", userId) - return q.CountWithError() -} - func (manager *SKeypairManager) FilterByOwner(ctx context.Context, q *sqlchemy.SQuery, man db.FilterByOwnerProvider, userCred mcclient.TokenCredential, owner mcclient.IIdentityProvider, scope rbacscope.TRbacScope) *sqlchemy.SQuery { return db.SharableManagerFilterByOwner(ctx, manager.GetISharableVirtualModelManager(), q, userCred, owner, scope) }