Skip to content

Commit 9363e50

Browse files
committed
Show apikeyaccess on the left panel in the user view for root admins as well
1 parent 0da6265 commit 9363e50

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

ui/src/components/view/InfoCard.vue

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -733,14 +733,16 @@
733733
</div>
734734
</div>
735735

736-
<div class="account-center-tags" v-if="showKeys">
736+
<div class="account-center-tags">
737737
<a-divider/>
738-
<div class="resource-detail-item" v-if="resource.userapikeyaccess && !isAdmin()">
738+
<div class="resource-detail-item" v-if="resource.apikeyaccess">
739739
<div class="resource-detail-item__label">{{ $t('label.apikeyaccess') }}</div>
740740
<div class="resource-detail-item__details">
741-
<status class="status" :text="resource.userapikeyaccess" displayText/>
741+
<status class="status" :text="resource.apikeyaccess" displayText/>
742742
</div>
743743
</div>
744+
</div>
745+
<div class="account-center-tags" v-if="showKeys">
744746
<div class="user-keys">
745747
<key-outlined />
746748
<strong>
@@ -1089,7 +1091,9 @@ export default {
10891091
api('getUserKeys', { id: this.resource.id }).then(json => {
10901092
this.showKeys = true
10911093
this.newResource.secretkey = json.getuserkeysresponse.userkeys.secretkey
1092-
this.newResource.userapikeyaccess = json.getuserkeysresponse.userkeys.apikeyaccess ? 'Enabled' : 'Disabled'
1094+
if (!this.isAdmin()) {
1095+
this.newResource.apikeyaccess = json.getuserkeysresponse.userkeys.apikeyaccess ? 'Enabled' : 'Disabled'
1096+
}
10931097
this.$emit('change-resource', this.newResource)
10941098
})
10951099
},

ui/src/config/section/user.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default {
3333
return filters
3434
},
3535
columns: ['username', 'state', 'firstname', 'lastname', 'email', 'account', 'domain'],
36-
details: ['username', 'id', 'firstname', 'lastname', 'email', 'usersource', 'timezone', 'rolename', 'roletype', 'is2faenabled', 'apikeyaccess', 'account', 'domain', 'created'],
36+
details: ['username', 'id', 'firstname', 'lastname', 'email', 'usersource', 'timezone', 'rolename', 'roletype', 'is2faenabled', 'account', 'domain', 'created'],
3737
tabs: [
3838
{
3939
name: 'details',

0 commit comments

Comments
 (0)