Merge pull request #2407 from ioito/hotfix/qx-metadata-rbac-fix

fix: 避免admin=false时,不显示其余项目下的标签信息
This commit is contained in:
yunion-ci-robot
2019-08-21 15:32:09 +08:00
committed by GitHub
+1 -1
View File
@@ -163,7 +163,7 @@ func (manager *SMetadataManager) ListItemFilter(ctx context.Context, q *sqlchemy
prefix := sqlchemy.NewStringField(fmt.Sprintf("%s::", man.Keyword()))
field := sqlchemy.CONCAT(man.Keyword(), prefix, resourceView.Field("id"))
sq := resourceView.Query(field)
if !admin || !IsAllowList(rbacutils.ScopeSystem, userCred, man) {
if !admin && !IsAllowList(rbacutils.ScopeSystem, userCred, man) {
sq = man.FilterByOwner(sq, userCred, man.ResourceScope())
}
conditions = append(conditions, sqlchemy.In(q.Field("id"), sq))