opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Qiu Jian
2018-09-12 01:14:33 +08:00
parent c8e919af33
commit 1a30516b0f
9 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudcommon/db/fetch.go
+3 -3
View File
@@ -31,10 +31,10 @@ func fetchById(manager IModelManager, idStr string) (IModel, error) {
}
}
func fetchByName(manager IModelManager, ownerProjId string, idStr string) (IModel, error) {
func fetchByName(manager IModelManager, owner string, idStr string) (IModel, error) {
q := manager.Query()
q = manager.FilterByName(q, idStr)
q = manager.FilterByOwner(q, ownerProjId)
q = manager.FilterByOwner(q, owner)
count := q.Count()
if count == 1 {
obj, err := NewModelObject(manager)
@@ -101,7 +101,7 @@ func fetchItemByName(manager IModelManager, ctx context.Context, userCred mcclie
}
}
q = manager.FilterByName(q, idStr)
q = manager.FilterByOwner(q, userCred.GetProjectId())
q = manager.FilterByOwner(q, manager.GetOwnerId(userCred))
count := q.Count()
if count == 1 {
item, err := NewModelObject(manager)
pkg/cloudcommon/db/interface.go
+1 -1
View File
@@ -37,7 +37,7 @@ type IModelManager interface {
FilterById(q *sqlchemy.SQuery, idStr string) *sqlchemy.SQuery
FilterByNotId(q *sqlchemy.SQuery, idStr string) *sqlchemy.SQuery
FilterByName(q *sqlchemy.SQuery, name string) *sqlchemy.SQuery
FilterByOwner(q *sqlchemy.SQuery, ownerProjId string) *sqlchemy.SQuery
FilterByOwner(q *sqlchemy.SQuery, owner string) *sqlchemy.SQuery
GetOwnerId(userCred mcclient.TokenCredential) string
pkg/cloudcommon/db/modelbase.go
+1 -1
View File
@@ -104,7 +104,7 @@ func (manager *SModelBaseManager) FilterByName(q *sqlchemy.SQuery, name string)
return q
}
func (manager *SModelBaseManager) FilterByOwner(q *sqlchemy.SQuery, ownerProjId string) *sqlchemy.SQuery {
func (manager *SModelBaseManager) FilterByOwner(q *sqlchemy.SQuery, owner string) *sqlchemy.SQuery {
return q
}
pkg/cloudcommon/db/namevalidator.go
+2 -2
View File
@@ -7,11 +7,11 @@ import (
"yunion.io/x/pkg/util/stringutils"
)
func isNameUnique(manager IModelManager, ownerProjId string, name string) bool {
func isNameUnique(manager IModelManager, owner string, name string) bool {
q := manager.Query()
q = manager.FilterByName(q, name)
if !globalVirtualResourceNamespace {
q = manager.FilterByOwner(q, ownerProjId)
q = manager.FilterByOwner(q, owner)
}
return q.Count() == 0
}
pkg/cloudcommon/db/opslog.go
+3 -3
View File
@@ -349,9 +349,9 @@ func (self *SOpsLogManager) FilterByName(q *sqlchemy.SQuery, name string) *sqlch
return q
}
func (self *SOpsLogManager) FilterByOwner(q *sqlchemy.SQuery, ownerProjId string) *sqlchemy.SQuery {
if len(ownerProjId) > 0 {
return q.Equals("owner_project_id", ownerProjId)
func (self *SOpsLogManager) FilterByOwner(q *sqlchemy.SQuery, owner string) *sqlchemy.SQuery {
if len(owner) > 0 {
return q.Equals("owner_project_id", owner)
} else {
return q
}
pkg/cloudcommon/db/sharablevirtual.go
+2 -2
View File
@@ -22,8 +22,8 @@ func NewSharableVirtualResourceBaseManager(dt interface{}, tableName string, key
return SSharableVirtualResourceBaseManager{SVirtualResourceBaseManager: NewVirtualResourceBaseManager(dt, tableName, keyword, keywordPlural)}
}
func (manager *SSharableVirtualResourceBaseManager) FilterByOwner(q *sqlchemy.SQuery, ownerProjId string) *sqlchemy.SQuery {
q = q.Filter(sqlchemy.OR(sqlchemy.Equals(q.Field("tenant_id"), ownerProjId), sqlchemy.IsTrue(q.Field("is_public"))))
func (manager *SSharableVirtualResourceBaseManager) FilterByOwner(q *sqlchemy.SQuery, owner string) *sqlchemy.SQuery {
q = q.Filter(sqlchemy.OR(sqlchemy.Equals(q.Field("tenant_id"), owner), sqlchemy.IsTrue(q.Field("is_public"))))
q = q.Filter(sqlchemy.OR(sqlchemy.IsNull(q.Field("pending_deleted")), sqlchemy.IsFalse(q.Field("pending_deleted"))))
q = q.Filter(sqlchemy.OR(sqlchemy.IsNull(q.Field("is_system")), sqlchemy.IsFalse(q.Field("is_system"))))
return q
pkg/cloudcommon/db/taskman/tasks.go
+1 -1
View File
@@ -87,7 +87,7 @@ func (manager *STaskManager) FilterByName(q *sqlchemy.SQuery, name string) *sqlc
return q
}
func (manager *STaskManager) FilterByOwner(q *sqlchemy.SQuery, ownerProjId string) *sqlchemy.SQuery {
func (manager *STaskManager) FilterByOwner(q *sqlchemy.SQuery, owner string) *sqlchemy.SQuery {
return q
}
pkg/cloudcommon/db/virtualresource.go
+2 -2
View File
@@ -49,8 +49,8 @@ func (model *SVirtualResourceBase) GetOwnerProjectId() string {
return model.ProjectId
}
func (manager *SVirtualResourceBaseManager) FilterByOwner(q *sqlchemy.SQuery, ownerProjId string) *sqlchemy.SQuery {
q = q.Equals("tenant_id", ownerProjId)
func (manager *SVirtualResourceBaseManager) FilterByOwner(q *sqlchemy.SQuery, owner string) *sqlchemy.SQuery {
q = q.Equals("tenant_id", owner)
q = q.Filter(sqlchemy.OR(sqlchemy.IsNull(q.Field("pending_deleted")), sqlchemy.IsFalse(q.Field("pending_deleted"))))
q = q.Filter(sqlchemy.OR(sqlchemy.IsNull(q.Field("is_system")), sqlchemy.IsFalse(q.Field("is_system"))))
return q
pkg/compute/models/keypairs.go
+2 -2
View File
@@ -116,8 +116,8 @@ func totalKeypairCount(userId string) int {
return q.Count()
}
func (manager *SKeypairManager) FilterByOwner(q *sqlchemy.SQuery, ownerId string) *sqlchemy.SQuery {
return q.Equals("owner_id", ownerId)
func (manager *SKeypairManager) FilterByOwner(q *sqlchemy.SQuery, owner string) *sqlchemy.SQuery {
return q.Equals("owner_id", owner)
}
func (self *SKeypair) GetOwnerProjectId() string {