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

omitempty

Browse Source
This commit is contained in:
runzexia
2019-04-28 11:49:52 +08:00
parent b448a8ca95
commit 04fc601d0e
4 changed files with 53 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/models/devops/project_member_handler.go
View File

@@ -106,17 +106,18 @@ func AddProjectMember(projectId, operator string, member *DevOpsProjectMembershi
Where(db.And(
db.Eq(DevOpsProjectMembershipUsernameColumn, member.Username),
db.Eq(DevOpsProjectMembershipProjectIdColumn, projectId))).LoadOne(membership)
if err != nil && err != db.ErrNotFound {
glog.Errorf("%+v", err)
return nil, restful.NewError(http.StatusInternalServerError, err.Error())
}
// if user could be founded in db, user have been added to project
if err != db.ErrNotFound {
if err == nil {
err = fmt.Errorf("user [%s] have been added to project", member.Username)
glog.Errorf("%+v", err)
return nil, restful.NewError(http.StatusBadRequest, err.Error())
}
if err != nil && err != db.ErrNotFound {
glog.Errorf("%+v", err)
return nil, restful.NewError(http.StatusInternalServerError, err.Error())
}
globalRole, err := jenkinsClinet.GetGlobalRole(JenkinsAllUserRoleName)
if err != nil {
glog.Errorf("%+v", err)