haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-12 21:30:39 +00:00
Code Issues Releases Wiki Activity

update msg when admin delete user (#5648)

Browse Source 
use `Deleted user xxx`
This commit is contained in:
lian
2023-09-19 14:42:15 +08:00
committed by GitHub
parent 78d583f615
commit 230eaaa8f0
8 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/pages/org-admin/org-user-item.js
View File

@@ -52,7 +52,8 @@ class UserItem extends React.Component {
toggleDelete = () => { toggleDelete = () => {
const email = this.props.user.email; const email = this.props.user.email;
this.props.toggleDelete(email); const username = this.props.user.name;
this.props.toggleDelete(email, username);
}; };
toggleResetPW = () => { toggleResetPW = () => {

6
frontend/src/pages/org-admin/org-users-admins.js
View File

@@ -36,13 +36,13 @@ class OrgUsers extends Component {
}); });
}; };
toggleOrgAdminDelete = (email) => { toggleOrgAdminDelete = (email, username) => {
seafileAPI.orgAdminDeleteOrgUser(orgID, email).then(res => { seafileAPI.orgAdminDeleteOrgUser(orgID, email).then(res => {
this.setState({ this.setState({
orgAdminUsers: this.state.orgAdminUsers.filter(item => item.email != email) orgAdminUsers: this.state.orgAdminUsers.filter(item => item.email != email)
}); });
let msg = gettext('Successfully deleted %s'); let msg = gettext('Deleted user %s');
msg = msg.replace('%s', email); msg = msg.replace('%s', username);
toaster.success(msg); toaster.success(msg);
}).catch(error => { }).catch(error => {
let errMessage = Utils.getErrorMsg(error); let errMessage = Utils.getErrorMsg(error);

6
frontend/src/pages/org-admin/org-users-search-users.js
View File

@@ -104,13 +104,15 @@ class OrgUsersSearchUsers extends Component {
}); });
}; };
deleteUser = (email) => { deleteUser = (email, username) => {
seafileAPI.orgAdminDeleteOrgUser(orgID, email).then(res => { seafileAPI.orgAdminDeleteOrgUser(orgID, email).then(res => {
let newUserList = this.state.orgUsers.filter(item => { let newUserList = this.state.orgUsers.filter(item => {
return item.email != email; return item.email != email;
}); });
this.setState({orgUsers: newUserList}); this.setState({orgUsers: newUserList});
toaster.success(gettext('Successfully deleted 1 item.')); let msg = gettext('Deleted user %s');
msg = msg.replace('%s', username);
toaster.success(msg);
}).catch((error) => { }).catch((error) => {
let errMessage = Utils.getErrorMsg(error); let errMessage = Utils.getErrorMsg(error);
toaster.danger(errMessage); toaster.danger(errMessage);

6
frontend/src/pages/org-admin/org-users-users.js
View File

@@ -189,12 +189,12 @@ class OrgUsers extends Component {
}); });
}; };
toggleOrgUsersDelete = (email) => { toggleOrgUsersDelete = (email, username) => {
seafileAPI.orgAdminDeleteOrgUser(orgID, email).then(res => { seafileAPI.orgAdminDeleteOrgUser(orgID, email).then(res => {
let users = this.state.orgUsers.filter(item => item.email != email); let users = this.state.orgUsers.filter(item => item.email != email);
this.setState({orgUsers: users}); this.setState({orgUsers: users});
let msg = gettext('Successfully deleted %s'); let msg = gettext('Deleted user %s');
msg = msg.replace('%s', email); msg = msg.replace('%s', username);
toaster.success(msg); toaster.success(msg);
}).catch(error => { }).catch(error => {
let errMessage = Utils.getErrorMsg(error); let errMessage = Utils.getErrorMsg(error);

6
frontend/src/pages/sys-admin/users/search-users.js
View File

@@ -134,13 +134,15 @@ class SearchUsers extends Component {
}); });
}; };
deleteUser = (email) => { deleteUser = (email, username) => {
seafileAPI.sysAdminDeleteUser(email).then(res => { seafileAPI.sysAdminDeleteUser(email).then(res => {
let newUserList = this.state.userList.filter(item => { let newUserList = this.state.userList.filter(item => {
return item.email != email; return item.email != email;
}); });
this.setState({userList: newUserList}); this.setState({userList: newUserList});
toaster.success(gettext('Successfully deleted 1 item.')); let msg = gettext('Deleted user %s');
msg = msg.replace('%s', username);
toaster.success(msg);
}).catch((error) => { }).catch((error) => {
let errMessage = Utils.getErrorMsg(error); let errMessage = Utils.getErrorMsg(error);
toaster.danger(errMessage); toaster.danger(errMessage);

2
frontend/src/pages/sys-admin/users/users-content.js
View File

@@ -292,7 +292,7 @@ class Item extends Component {
deleteUser = () => { deleteUser = () => {
toaster.notify(gettext('It may take some time, please wait.')); toaster.notify(gettext('It may take some time, please wait.'));
this.props.deleteUser(this.props.item.email); this.props.deleteUser(this.props.item.email, this.props.item.name);
}; };
resetPassword = () => { resetPassword = () => {

6
frontend/src/pages/sys-admin/users/users.js
View File

@@ -197,13 +197,15 @@ class Users extends Component {
}); });
}; };
deleteUser = (email) => { deleteUser = (email, username) => {
seafileAPI.sysAdminDeleteUser(email).then(res => { seafileAPI.sysAdminDeleteUser(email).then(res => {
let newUserList = this.state.userList.filter(item => { let newUserList = this.state.userList.filter(item => {
return item.email != email; return item.email != email;
}); });
this.setState({userList: newUserList}); this.setState({userList: newUserList});
toaster.success(gettext('Successfully deleted 1 item.')); let msg = gettext('Deleted user %s');
msg = msg.replace('%s', username);
toaster.success(msg);
}).catch((error) => { }).catch((error) => {
let errMessage = Utils.getErrorMsg(error); let errMessage = Utils.getErrorMsg(error);
toaster.danger(errMessage); toaster.danger(errMessage);

3
seahub/base/templatetags/seahub_tags.py
View File

@@ -369,7 +369,8 @@ def email2nickname(value):
if profile is not None and profile.nickname and profile.nickname.strip(): if profile is not None and profile.nickname and profile.nickname.strip():
nickname = profile.nickname.strip() nickname = profile.nickname.strip()
else: else:
nickname = value.split('@')[0] contact_email = email2contact_email(value)
nickname = contact_email.split('@')[0]
cache.set(key, nickname, NICKNAME_CACHE_TIMEOUT) cache.set(key, nickname, NICKNAME_CACHE_TIMEOUT)
return nickname return nickname