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

update api docs & fmt code

Browse Source
This commit is contained in:
runzexia
2019-04-25 19:46:42 +08:00
parent a266d0e9f6
commit d42f886fe8
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/models/devops/common.go
View File

@@ -314,9 +314,9 @@ func CheckProjectUserInRole(username, projectId string, roles []string) error {
return nil
}
func GetProjectUserRole(username, projectId string) (string ,error) {
func GetProjectUserRole(username, projectId string) (string, error) {
if username == KS_ADMIN {
return ProjectOwner,nil
return ProjectOwner, nil
}
dbconn := devops_mysql.OpenDatabase()
membership := &DevOpsProjectMembership{}
@@ -326,8 +326,8 @@ func GetProjectUserRole(username, projectId string) (string ,error) {
db.Eq(DevOpsProjectMembershipUsernameColumn, username),
db.Eq(DevOpsProjectMembershipProjectIdColumn, projectId))).LoadOne(membership)
if err != nil {
return "",err
return "", err
}
return membership.Role,nil
return membership.Role, nil
}

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

@@ -254,7 +254,7 @@ func CreateDevopsProject(username string, workspace string, req *devops.DevOpsPr
}
func GetUserDevopsSimpleRules(username, projectId string) ([]models.SimpleRule, error) {
role,err := devops.GetProjectUserRole(username,projectId)
role, err := devops.GetProjectUserRole(username, projectId)
if err != nil {
glog.Errorf("%+v", err)
return nil, restful.NewError(http.StatusForbidden, err.Error())