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

Allow admins to delete users

Browse Source
This commit is contained in:
Toby Zerner
2015-08-05 12:08:28 +09:30
parent 4d2aac7645
commit 151af395c9
4 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/core/js/forum/src/components/UserCard.js
View File

@@ -39,7 +39,8 @@ export default class UserCard extends Component {
children: controls,
className: 'UserCard-controls App-primaryControl',
menuClassName: 'Dropdown-menu--right',
buttonClassName: this.props.controlsButtonClassName
buttonClassName: this.props.controlsButtonClassName,
icon: 'ellipsis-v'
}) : ''}
<div className="UserCard-profile">

14
framework/core/js/forum/src/utils/UserControls.js
View File

@@ -1,7 +1,7 @@
import Button from 'flarum/components/Button';
import Separator from 'flarum/components/Separator';
import EditUserModal from 'flarum/components/EditUserModal';
import DeleteUserModal from 'flarum/components/DeleteUserModal';
import UserPage from 'flarum/components/UserPage';
import ItemList from 'flarum/utils/ItemList';
/**
@@ -80,7 +80,7 @@ export default {
destructiveControls(user) {
const items = new ItemList();
if (user.canDelete()) {
if (user.id() !== '1' && user.canDelete()) {
items.add('delete', Button.component({
icon: 'times',
children: app.trans('core.delete'),
@@ -95,7 +95,15 @@ export default {
* Delete the user.
*/
deleteAction() {
app.modal.show(new DeleteUserModal({user: this}));
if (confirm('Are you sure you want to delete this user? All of the user\'s posts will be deleted.')) {
this.delete().then(() => {
if (app.current instanceof UserPage && app.current.user === this) {
app.history.back();
} else {
window.location.reload();
}
});
}
},
/**