itizawa 6 лет назад
Родитель
Сommit
1b8d553282

+ 1 - 1
resource/locales/en-US/translation.json

@@ -719,7 +719,7 @@
     "remove_user_admin": "Succeeded to remove {{username}} admin ",
     "activate_user_success": "Succeeded to activating {{username}}",
     "deactivate_user_success": "Succeeded to deactivate {{username}}",
-    "remove_user_success": "Succeeded to removing {{username}} ",
+    "remove_user_success": "Succeeded to removing {{userId}} ",
     "remove_external_user_success": "Succeeded to remove {{accountId}} "
   },
 

+ 1 - 1
resource/locales/ja/translation.json

@@ -703,7 +703,7 @@
     "remove_user_admin": "{{username}}を管理者から外しました",
     "activate_user_success": "{{username}}を有効化しました",
     "deactivate_user_success": "{{username}}を無効化しました",
-    "remove_user_success": "{{username}}を削除しました",
+    "remove_user_success": "{{userId}}を削除しました",
     "remove_external_user_success": "{{accountId}}を削除しました "
 
   },

+ 3 - 2
src/client/js/components/Admin/Users/UserRemoveButton.jsx

@@ -19,8 +19,9 @@ class UserRemoveButton extends React.Component {
     const { t } = this.props;
 
     try {
-      const username = await this.props.adminUsersContainer.removeUser(this.props.user._id);
-      toastSuccess(t('user_management.remove_user_success', { username }));
+      const userData = await this.props.adminUsersContainer.removeUser(this.props.user._id);
+      const userId = userData._id;
+      toastSuccess(t('user_management.remove_user_success', { userId }));
     }
     catch (err) {
       toastError(err);

+ 2 - 2
src/client/js/services/AdminUsersContainer.js

@@ -163,13 +163,13 @@ export default class AdminUsersContainer extends Container {
    * remove user
    * @memberOf AdminUsersContainer
    * @param {string} userId
-   * @return {string} username
+   * @return {string} userData
    */
   async removeUser(userId) {
     const response = await this.appContainer.apiv3.delete(`/users/${userId}/remove`);
     const removedUserData = response.data.userData;
     await this.retrieveUsersByPagingNum(this.state.activePage);
-    return removedUserData.username;
+    return removedUserData;
   }
 
 }

+ 0 - 1
src/server/routes/apiv3/users.js

@@ -392,7 +392,6 @@ module.exports = (crowi) => {
    *                      type: object
    *                      description: A result of `ExtenralAccount.findByIdAndRemove`
    */
-
   router.delete('/external-accounts/:id/remove', loginRequiredStrictly, adminRequired, ApiV3FormValidator, async(req, res) => {
     const { id } = req.params;