Skip to content
Snippets Groups Projects
Verified Commit e232ab65 authored by Benedikt Wildenhain's avatar Benedikt Wildenhain
Browse files

Allow to change email address again

parent 139897fc
Branches
No related tags found
No related merge requests found
Pipeline #1268 failed
...@@ -158,7 +158,7 @@ module Api ...@@ -158,7 +158,7 @@ module Api
end end
def update_user_params 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 end
def change_password_params def change_password_params
......
...@@ -71,7 +71,7 @@ export default function UpdateUserForm({ user }) { ...@@ -71,7 +71,7 @@ export default function UpdateUserForm({ user }) {
return ( return (
<Form methods={methods} onSubmit={updateUserAPI.mutate}> <Form methods={methods} onSubmit={updateUserAPI.mutate}>
<FormControl field={fields.name} type="text" /> <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"> <FormSelect field={fields.language} variant="dropdown">
{ {
Object.keys(locales || {}).map((code) => <Option key={code} value={code}>{locales[code]}</Option>) Object.keys(locales || {}).map((code) => <Option key={code} value={code}>{locales[code]}</Option>)
......
docker build -t gitlab.cvh-server.de:5050/hardwarenahe-it/greenlight:v3-modify-mail .
...@@ -313,6 +313,7 @@ RSpec.describe Api::V1::UsersController, type: :controller do ...@@ -313,6 +313,7 @@ RSpec.describe Api::V1::UsersController, type: :controller do
it 'updates the users attributes' do it 'updates the users attributes' do
updated_params = { updated_params = {
name: 'New Name', name: 'New Name',
email: 'mail@example.org',
language: 'fr' language: 'fr'
} }
patch :update, params: { id: user.id, user: updated_params } patch :update, params: { id: user.id, user: updated_params }
...@@ -321,6 +322,7 @@ RSpec.describe Api::V1::UsersController, type: :controller do ...@@ -321,6 +322,7 @@ RSpec.describe Api::V1::UsersController, type: :controller do
user.reload user.reload
expect(user.name).to eq(updated_params[:name]) expect(user.name).to eq(updated_params[:name])
expect(user.email).to eq(updated_params[:email])
expect(user.language).to eq(updated_params[:language]) expect(user.language).to eq(updated_params[:language])
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment