From 54199058e3fa8b1e18ba787514e5ad92029984b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Mon, 22 Nov 2021 14:34:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8D=E5=8A=A1=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=88=9B=E5=BB=BA=E7=9A=84Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/actions/default/servers/create.go | 26 +++++++++++++------ web/views/@default/servers/create.html | 2 +- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/internal/web/actions/default/servers/create.go b/internal/web/actions/default/servers/create.go index d7370d99..891542de 100644 --- a/internal/web/actions/default/servers/create.go +++ b/internal/web/actions/default/servers/create.go @@ -57,6 +57,14 @@ func (this *CreateAction) RunGet(params struct{}) { // 服务类型 this.Data["serverTypes"] = serverconfigs.AllServerTypes() + // 检查是否有用户 + countUsersResp, err := this.RPC().UserRPC().CountAllEnabledUsers(this.AdminContext(), &pb.CountAllEnabledUsersRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + this.Data["hasUsers"] = countUsersResp.Count > 0 + this.Show() } @@ -94,14 +102,16 @@ func (this *CreateAction) RunPost(params struct { // 用户 var userId = params.UserId - clusterIdResp, err := this.RPC().UserRPC().FindUserNodeClusterId(this.AdminContext(), &pb.FindUserNodeClusterIdRequest{UserId: userId}) - if err != nil { - this.ErrorPage(err) - return - } - clusterId = clusterIdResp.NodeClusterId - if clusterId <= 0 { - this.Fail("请选择部署的集群") + if userId > 0 { + clusterIdResp, err := this.RPC().UserRPC().FindUserNodeClusterId(this.AdminContext(), &pb.FindUserNodeClusterIdRequest{UserId: userId}) + if err != nil { + this.ErrorPage(err) + return + } + clusterId = clusterIdResp.NodeClusterId + if clusterId <= 0 { + this.Fail("请选择部署的集群") + } } // 套餐 diff --git a/web/views/@default/servers/create.html b/web/views/@default/servers/create.html index a9d4d5b1..9fcdb809 100644 --- a/web/views/@default/servers/create.html +++ b/web/views/@default/servers/create.html @@ -11,7 +11,7 @@ - + 选择用户