Skip to content

Commit e08bb49

Browse files
feat(role): 修改role显示
1 parent d06d5f7 commit e08bb49

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

internal/api/v1/v1.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func apiResourceHandler(party iris.Party) iris.Handler {
168168
if len(ss) >= 4 {
169169
resourceName := ss[3]
170170
//过滤session资源
171-
if resourceName == "sessions" || resourceName == "proxy" || resourceName == "ws" || resourceName == "charts" || resourceName == "webkubectl" {
171+
if resourceName == "sessions" || resourceName == "proxy" || resourceName == "ws" || resourceName == "charts" || resourceName == "webkubectl" || resourceName == "apps" {
172172
continue
173173
}
174174
if _, ok := resourceMap[resourceName]; !ok {

migrate/v1/migrations.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ var CreateAdministrator = migrations.Migration{
2525
Handler: func(db storm.Node) error {
2626
//
2727

28-
29-
3028
roleManageClusters := v1Role.Role{
3129
BaseModel: v1.BaseModel{
3230
ApiVersion: "v1",
@@ -62,7 +60,7 @@ var CreateAdministrator = migrations.Migration{
6260
},
6361
Rules: []v1Role.PolicyRule{
6462
{
65-
Resource: []string{"users", "roles"},
63+
Resource: []string{"users", "roles", "ldap"},
6664
Verbs: []string{"*"},
6765
},
6866
},

web/kubepi/src/business/user-management/ldap/index.vue

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
<el-col :span="15">
55
<div class="grid-content bg-purple-light">
66
<el-form ref="form" v-loading="loading" label-position="left" :rules="rules" :model="form" label-width="150px">
7-
<el-form-item style="width: 100%" :label="$t('business.user.ldap_address')" prop="address" required>
7+
<el-form-item style="width: 100%" :label="$t('business.user.ldap_address')" prop="address" >
88
<el-input v-model="form.address"></el-input>
99
</el-form-item>
10-
<el-form-item style="width: 100%" :label="$t('business.user.ldap_port')" prop="port" required>
10+
<el-form-item style="width: 100%" :label="$t('business.user.ldap_port')" prop="port" >
1111
<el-input v-model="form.port" type="number"></el-input>
1212
</el-form-item>
13-
<el-form-item style="width: 100%" :label="$t('business.user.ldap_username')" prop="username" required>
13+
<el-form-item style="width: 100%" :label="$t('business.user.ldap_username')" prop="username">
1414
<el-input v-model="form.username"></el-input>
1515
</el-form-item>
16-
<el-form-item style="width: 100%" :label="$t('business.user.ldap_password')" prop="password" required>
16+
<el-form-item style="width: 100%" :label="$t('business.user.ldap_password')" prop="password">
1717
<el-input type="password" v-model="form.password"></el-input>
1818
</el-form-item>
19-
<el-form-item style="width: 100%" :label="$t('business.user.ldap_filter_dn')" prop="dn" required>
19+
<el-form-item style="width: 100%" :label="$t('business.user.ldap_filter_dn')" prop="dn">
2020
<el-input v-model="form.dn"></el-input>
2121
</el-form-item>
22-
<el-form-item style="width: 100%" :label="$t('business.user.ldap_filter_rule')" prop="filter" required>
22+
<el-form-item style="width: 100%" :label="$t('business.user.ldap_filter_rule')" prop="filter">
2323
<el-input v-model="form.filter"></el-input>
2424
</el-form-item>
2525
<el-form-item>
@@ -33,11 +33,11 @@
3333

3434
<div style="float: right">
3535
<el-form-item>
36-
<el-button @click="sync" :disabled="isSubmitGoing">{{
36+
<el-button @click="sync" :disabled="isSubmitGoing" v-has-permissions="{resource:'ldap',verb:'create'}">{{
3737
$t("commons.button.sync")
3838
}}
3939
</el-button>
40-
<el-button type="primary" @click="onSubmit" :disabled="isSubmitGoing">{{ $t("commons.button.confirm") }}
40+
<el-button type="primary" @click="onSubmit" :disabled="isSubmitGoing" v-has-permissions="{resource:'ldap',verb:'create'}">{{ $t("commons.button.confirm") }}
4141
</el-button>
4242
</el-form-item>
4343
</div>

web/kubepi/src/router/modules/users.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ const UserManagement = {
9393
component: () => import("@/business/user-management/ldap"),
9494
name: "LDAP",
9595
requirePermission: {
96-
resource: "users",
96+
resource: "ldap",
9797
verb: "list"
9898
},
9999
meta: {

0 commit comments

Comments
 (0)