opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): avoid panic when update user resource (#24071)

Browse Source
This commit is contained in:
屈轩
2026-01-13 18:20:57 +08:00
committed by GitHub
parent a640fb3d60
commit cfde0396c3
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/sharablebase.go
+1 -1
View File
@@ -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")
pkg/compute/models/keypairs.go
-5
View File
@@ -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)
}