fix comment

Signed-off-by: runzexia <runzexia@yunify.com>
This commit is contained in:
runzexia
2019-09-02 12:58:47 +08:00
parent 93db1f982e
commit 003bba5b62
3 changed files with 3 additions and 5 deletions

View File

@@ -136,7 +136,6 @@ func addWebService(c *restful.Container) error {
Metadata(restfulspec.KeyOpenAPITags, []string{constants.TenantResourcesTag}))
ws.Route(ws.GET("/devopscount").
To(tenant.GetDevOpsProjectsCount).
Param(ws.PathParameter("member", "workspace member's username")).
Returns(http.StatusOK, ok, struct {
Count uint32 `json:"count"`
}{}).

View File

@@ -24,6 +24,7 @@ import (
rbacv1 "k8s.io/api/rbac/v1"
k8serr "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/util/net"
"k8s.io/klog"
"kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1"
"kubesphere.io/kubesphere/pkg/apiserver/logging"
"kubesphere.io/kubesphere/pkg/constants"
@@ -249,7 +250,7 @@ func GetDevOpsProjectsCount(req *restful.Request, resp *restful.Response) {
result, err := tenant.GetDevOpsProjectsCount(username)
if err != nil {
glog.Errorf("%+v", err)
klog.Errorf("%+v", err)
errors.ParseSvcErr(err, resp)
return
}

View File

@@ -113,9 +113,7 @@ func GetDevOpsProjectsCount(username string) (uint32, error) {
From(devops.DevOpsProjectTableName)
var sqconditions []dbr.Builder
switch username {
case devops.KS_ADMIN:
default:
if username != devops.KS_ADMIN {
onCondition := fmt.Sprintf("%s = %s", devops.DevOpsProjectMembershipProjectIdColumn, devops.DevOpsProjectIdColumn)
query.Join(devops.DevOpsProjectMembershipTableName, onCondition)
sqconditions = append(sqconditions, db.Eq(devops.DevOpsProjectMembershipUsernameColumn, username))