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: remove mutual dependency of cloudmux on onecloud (#15621)

Browse Source 
Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
This commit is contained in:
Jian Qiu
2022-12-27 01:21:26 +08:00
committed by GitHub
co-authored by Qiu Jian
parent 9804fbaf7a
commit 21716cefb5
1123 changed files with 36590 additions and 19291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/devtool/models/script_apply_record.go
+7 -7
View File
@@ -20,12 +20,12 @@ import (
"yunion.io/x/jsonutils"
"yunion.io/x/log"
"yunion.io/x/pkg/util/rbacscope"
"yunion.io/x/sqlchemy"
api "yunion.io/x/onecloud/pkg/apis/devtool"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/util/rbacutils"
"yunion.io/x/onecloud/pkg/util/stringutils2"
)
@@ -128,18 +128,18 @@ func (sarm *SScriptApplyRecordManager) createRecordWithResult(ctx context.Contex
return sar, nil
}
func (sarm *SScriptApplyRecordManager) NamespaceScope() rbacutils.TRbacScope {
return rbacutils.ScopeProject
func (sarm *SScriptApplyRecordManager) NamespaceScope() rbacscope.TRbacScope {
return rbacscope.ScopeProject
}
func (sarm *SScriptApplyRecordManager) ResourceScope() rbacutils.TRbacScope {
return rbacutils.ScopeProject
func (sarm *SScriptApplyRecordManager) ResourceScope() rbacscope.TRbacScope {
return rbacscope.ScopeProject
}
func (sarm *SScriptApplyRecordManager) FileterByOwner(q *sqlchemy.SQuery, owner mcclient.IIdentityProvider, scope rbacutils.TRbacScope) *sqlchemy.SQuery {
func (sarm *SScriptApplyRecordManager) FileterByOwner(q *sqlchemy.SQuery, owner mcclient.IIdentityProvider, scope rbacscope.TRbacScope) *sqlchemy.SQuery {
if owner != nil {
switch scope {
case rbacutils.ScopeProject, rbacutils.ScopeDomain:
case rbacscope.ScopeProject, rbacscope.ScopeDomain:
scriptQ := ScriptManager.Query("id", "domain_id").SubQuery()
q = q.Join(scriptQ, sqlchemy.Equals(q.Field("script_id"), scriptQ.Field("id")))
q = q.Filter(sqlchemy.Equals(scriptQ.Field("domain_id"), owner.GetProjectDomainId()))