mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-07 17:07:19 +02:00
Code Issues Releases Wiki Activity

Revert "feat: provide an 'actions' dropdown for extensions to add their additional buttons"

Browse Source 
This reverts commit 772852b3b3.
This commit is contained in:
IanM
2024-10-02 09:53:12 +01:00
parent 772852b3b3
commit ea2fd2cade
2 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
framework/core/js/src/admin/components/UserListPage.tsx
View File

@@ -18,7 +18,6 @@ import extractText from '../../common/utils/extractText';
import AdminPage from './AdminPage'; import AdminPage from './AdminPage';
import { debounce } from '../../common/utils/throttleDebounce'; import { debounce } from '../../common/utils/throttleDebounce';
import CreateUserModal from './CreateUserModal'; import CreateUserModal from './CreateUserModal';
import Dropdown from '../../common/components/Dropdown';
type ColumnData = { type ColumnData = {
/** /**
@@ -426,18 +425,17 @@ export default class UserListPage extends AdminPage {
); );
columns.add( columns.add(
'userActions', 'editUser',
{ {
name: app.translator.trans('core.admin.users.grid.columns.user_actions.title'), name: app.translator.trans('core.admin.users.grid.columns.edit_user.title'),
content: (user: User) => ( content: (user: User) => (
<Dropdown <Button
className="User-controls" className="Button UserList-editModalBtn"
buttonClassName="Button Button--icon Button--flat" title={app.translator.trans('core.admin.users.grid.columns.edit_user.tooltip', { username: user.username() })}
menuClassName="Dropdown-menu--right" onclick={() => app.modal.show(EditUserModal, { user })}
icon="fas fa-ellipsis-h"
> >
{this.userActionItems(user).toArray()} {app.translator.trans('core.admin.users.grid.columns.edit_user.button')}
</Dropdown> </Button>
), ),
}, },
-90 -90
@@ -455,24 +453,6 @@ export default class UserListPage extends AdminPage {
}; };
} }
userActionItems(user: User): ItemList<Mithril.Children> {
const items = new ItemList<Mithril.Children>();
items.add(
'editUser',
<Button
icon="fas fa-pencil-alt"
className="Button UserList-editModalBtn"
title={app.translator.trans('core.admin.users.grid.columns.edit_user.tooltip', { username: user.username() })}
onclick={() => app.modal.show(EditUserModal, { user })}
>
{app.translator.trans('core.admin.users.grid.columns.edit_user.button')}
</Button>
);
return items;
}
/** /**
* Asynchronously fetch the next set of users to be rendered. * Asynchronously fetch the next set of users to be rendered.
* *

4
framework/core/locale/core.yml
View File

@@ -271,6 +271,7 @@ core:
edit_user: edit_user:
button: => core.ref.edit button: => core.ref.edit
title: => core.ref.edit_user
tooltip: Edit {username} tooltip: Edit {username}
email: email:
@@ -285,9 +286,6 @@ core:
join_time: join_time:
title: Joined title: Joined
user_actions:
title: Actions
user_id: user_id:
title: ID title: ID