admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix api

Browse Source
This commit is contained in:
runzexia
2019-04-25 16:28:48 +08:00
parent 6c928258c6
commit 1def6baf56
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/models/tenant/devops.go
View File

@@ -254,26 +254,12 @@ func CreateDevopsProject(username string, workspace string, req *devops.DevOpsPr
}
func GetUserDevopsSimpleRules(username, projectId string) ([]models.SimpleRule, error) {
err := devops.CheckProjectUserInRole(username, projectId, devops.AllRoleSlice)
role,err := devops.GetProjectUserRole(username,projectId)
if err != nil {
glog.Errorf("%+v", err)
return nil, restful.NewError(http.StatusForbidden, err.Error())
}
dbconn := devops_mysql.OpenDatabase()
memberships := &devops.DevOpsProjectMembership{}
err = dbconn.Select(devops.DevOpsProjectMembershipColumns...).
From(devops.DevOpsProjectMembershipTableName).
Where(db.And(
db.Eq(devops.DevOpsProjectMembershipProjectIdColumn, projectId),
db.Eq(devops.DevOpsProjectMembershipUsernameColumn, username))).
LoadOne(&memberships)
if err != nil {
glog.Errorf("%+v", err)
return nil, restful.NewError(http.StatusInternalServerError, err.Error())
}
return GetDevopsRoleSimpleRules(memberships.Role), nil
return GetDevopsRoleSimpleRules(role), nil
}
func GetDevopsRoleSimpleRules(role string) []models.SimpleRule {