Skip to content

Commit e47dee8

Browse files
committed
1. allow enter key to submit change password form
2. hide force password reset for disabled/locked user in ui
1 parent d3c25f1 commit e47dee8

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

ui/src/config/section/user.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ export default {
9696
},
9797
popup: true,
9898
show: (record, store) => {
99-
return ['Admin', 'DomainAdmin'].includes(store.userInfo.roletype) &&
100-
!record.isdefault && (store.userInfo.id !== record.id)
99+
return ['Admin', 'DomainAdmin'].includes(store.userInfo.roletype) && !record.isdefault &&
100+
store.userInfo.id !== record.id && record.state === 'enabled' && record.usersource === 'native'
101101
}
102102
},
103103
{

ui/src/views/iam/ForceChangePassword.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,11 @@
8484

8585
<a-form-item>
8686
<a-button
87+
html-type="submit"
8788
type="primary"
8889
size="large"
8990
block
91+
:disabled="loading"
9092
:loading="loading"
9193
@click="handleSubmit"
9294
>

0 commit comments

Comments
 (0)