From 94463f6ad285e4a0f1fee77761a7a10d8bde0faf Mon Sep 17 00:00:00 2001 From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com> Date: Sat, 29 Jun 2024 22:48:56 +0900 Subject: [PATCH 1/2] Update UpdateUserForm.jsx --- app/javascript/components/users/user/forms/UpdateUserForm.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/components/users/user/forms/UpdateUserForm.jsx b/app/javascript/components/users/user/forms/UpdateUserForm.jsx index 740f8d420f..0bf18211d2 100644 --- a/app/javascript/components/users/user/forms/UpdateUserForm.jsx +++ b/app/javascript/components/users/user/forms/UpdateUserForm.jsx @@ -70,7 +70,7 @@ export default function UpdateUserForm({ user }) { return (
- + { From 98d35e2280197eaf328f70c3b52214273a8508e1 Mon Sep 17 00:00:00 2001 From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com> Date: Sat, 29 Jun 2024 22:51:42 +0900 Subject: [PATCH 2/2] Update users_controller.rb --- app/controllers/api/v1/users_controller.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index d28c0834a3..e891d596c9 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -166,11 +166,7 @@ def create_user_params end def update_user_params - @update_user_params ||= if external_auth? - params.require(:user).permit(:password, :avatar, :language, :role_id, :invite_token) - else - params.require(:user).permit(:name, :password, :avatar, :language, :role_id, :invite_token) - end + @update_user_params ||= params.require(:user).permit(:name, :password, :avatar, :language, :role_id, :invite_token) end def change_password_params