p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'hot-fix/0.5.0' of git.backyard.segmentfault.com:opensource/answer into hot-fix/0.5.0

This commit is contained in:
aichy126 2022-12-06 14:36:41 +08:00
parent 4c838fccfe f5f3945a45
commit 8c4dc92f58
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui/src/pages/Admin/Users/index.tsx
View File

@ -22,7 +22,7 @@ import '../index.scss';
const UserFilterKeys: Type.UserFilterBy[] = [ const UserFilterKeys: Type.UserFilterBy[] = [
'all', 'all',
'staff', // 'staff',
'inactive', 'inactive',
'suspended', 'suspended',
'deleted', 'deleted',
@ -131,7 +131,7 @@ const Users: FC = () => {
)} )}
<th style={{ width: '12%' }}>{t('status')}</th> <th style={{ width: '12%' }}>{t('status')}</th>
<th style={{ width: '12%' }}>{t('role')}</th> {/* <th style={{ width: '12%' }}>{t('role')}</th> */}
{curFilter !== 'deleted' ? ( {curFilter !== 'deleted' ? (
<th style={{ width: '8%' }} className="text-end"> <th style={{ width: '8%' }} className="text-end">
{t('action')} {t('action')}
@ -173,11 +173,11 @@ const Users: FC = () => {
{t(user.status)} {t(user.status)}
</span> </span>
</td> </td>
<td> {/* <td> */}
<span className="badge text-bg-light"> {/* <span className="badge text-bg-light"> */}
{t(user.role_name)} {/* {t(user.role_name)} */}
</span> {/* </span> */}
</td> {/* </td> */}
{curFilter !== 'deleted' ? ( {curFilter !== 'deleted' ? (
<td className="text-end"> <td className="text-end">
<Dropdown> <Dropdown>
@ -190,10 +190,10 @@ const Users: FC = () => {
onClick={() => handleAction('status', user)}> onClick={() => handleAction('status', user)}>
{t('change_status')} {t('change_status')}
</Dropdown.Item> </Dropdown.Item>
<Dropdown.Item {/* <Dropdown.Item */}
onClick={() => handleAction('role', user)}> {/* onClick={() => handleAction('role', user)}> */}
{t('change_role')} {/* {t('change_role')} */}
</Dropdown.Item> {/* </Dropdown.Item> */}
{/* <Dropdown.Divider /> {/* <Dropdown.Divider />
<Dropdown.Item>{t('show_logs')}</Dropdown.Item> */} <Dropdown.Item>{t('show_logs')}</Dropdown.Item> */}
</Dropdown.Menu> </Dropdown.Menu>