zhangyuheng/blessing-skin-server
1
0
Fork 0
forked from mirror/blessing-skin-server
Code Pull Requests Activity

disallow admin to delete self (fix #229) (#233)

Browse Source
This commit is contained in:
Pig Fang 2020-10-01 16:33:42 +08:00 committed by GitHub
parent aa78ca9535
commit 3815b9d4c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
resources/assets/src/views/admin/UsersManagement/Card.tsx
View File

@ -103,14 +103,16 @@ const Card: React.FC<Props> = (props) => {
{t('admin.toggleVerification')}
</a>
<div className="dropdown-divider"></div>
<a
href="#"
className="dropdown-item dropdown-item-danger"
onClick={props.onDelete}
>
<i className="fas fa-trash mr-2"></i>
{t('admin.deleteUser')}
</a>
{canModify && user.uid !== currentUser.uid && (
<a
href="#"
className="dropdown-item dropdown-item-danger"
onClick={props.onDelete}
>
<i className="fas fa-trash mr-2"></i>
{t('admin.deleteUser')}
</a>
)}
</div>
</div>
)}

2
resources/assets/src/views/admin/UsersManagement/Row.tsx
View File

@ -101,7 +101,7 @@ const Row: React.FC<Props> = (props) => {
</button>
<button
className="btn btn-danger"
disabled={!canModify}
disabled={!canModify || user.uid === currentUser.uid}
onClick={props.onDelete}
>
{t('admin.deleteUser')}

4
resources/assets/tests/views/admin/UsersManagement.test.tsx
View File

@ -221,7 +221,7 @@ describe('access control', () => {
expect(queryByText(t('admin.changeScore'))).toBeInTheDocument()
expect(queryByText(t('admin.changePermission'))).not.toBeInTheDocument()
expect(queryByText(t('admin.toggleVerification'))).toBeInTheDocument()
expect(queryByText(t('admin.deleteUser'))).toBeInTheDocument()
expect(queryByText(t('admin.deleteUser'))).not.toBeInTheDocument()
fireEvent.click(getByTitle('Table Mode'))
expect(queryByTitle(t('admin.changeEmail'))).toBeInTheDocument()
@ -230,7 +230,7 @@ describe('access control', () => {
expect(queryByTitle(t('admin.changePermission'))).not.toBeInTheDocument()
expect(queryByTitle(t('admin.toggleVerification'))).toBeInTheDocument()
expect(getByText(t('admin.changePassword'))).toBeEnabled()
expect(getByText(t('admin.deleteUser'))).toBeEnabled()
expect(getByText(t('admin.deleteUser'))).toBeDisabled()
})
})