diff --git a/app/controllers/api/v1/users_controller.rb b/app/controllers/api/v1/users_controller.rb index 98b5202494f5dff432c68afd80689f552797d0ab..c7ea3e28c2c91f80ed90fcb9ad861115243e29b5 100644 --- a/app/controllers/api/v1/users_controller.rb +++ b/app/controllers/api/v1/users_controller.rb @@ -158,7 +158,7 @@ module Api end def update_user_params - @update_user_params ||= params.require(:user).permit(:name, :password, :avatar, :language, :role_id, :invite_token) + @update_user_params ||= params.require(:user).permit(:name, :email, :password, :avatar, :language, :role_id, :invite_token) end def change_password_params diff --git a/app/javascript/components/users/user/forms/UpdateUserForm.jsx b/app/javascript/components/users/user/forms/UpdateUserForm.jsx index 7d524695b8df4216b58e8a3f75f02b575cc264f5..71da2547287b41077dfffb0e03d8d8ee75943889 100644 --- a/app/javascript/components/users/user/forms/UpdateUserForm.jsx +++ b/app/javascript/components/users/user/forms/UpdateUserForm.jsx @@ -71,7 +71,7 @@ export default function UpdateUserForm({ user }) { return ( <Form methods={methods} onSubmit={updateUserAPI.mutate}> <FormControl field={fields.name} type="text" /> - <FormControl field={fields.email} type="email" readOnly /> + <FormControl field={fields.email} type="email" /> <FormSelect field={fields.language} variant="dropdown"> { Object.keys(locales || {}).map((code) => <Option key={code} value={code}>{locales[code]}</Option>) diff --git a/build.sh b/build.sh new file mode 100644 index 0000000000000000000000000000000000000000..15d7dbdfd23834b43843cf3e34e4fd0b1c9e05de --- /dev/null +++ b/build.sh @@ -0,0 +1 @@ +docker build -t gitlab.cvh-server.de:5050/hardwarenahe-it/greenlight:v3-modify-mail . diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index e7f59cde50153a031ed84efb86fd5bb5447a27ab..0abbcc7b01200a6ec006573c563a7ed3a9d0a873 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -313,6 +313,7 @@ RSpec.describe Api::V1::UsersController, type: :controller do it 'updates the users attributes' do updated_params = { name: 'New Name', + email: 'mail@example.org', language: 'fr' } patch :update, params: { id: user.id, user: updated_params } @@ -321,6 +322,7 @@ RSpec.describe Api::V1::UsersController, type: :controller do user.reload expect(user.name).to eq(updated_params[:name]) + expect(user.email).to eq(updated_params[:email]) expect(user.language).to eq(updated_params[:language]) end