1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-19 13:54:25 +01:00

Fix a bug: unable to save user validation if admin click save user profile button after switch user valitation

This commit is contained in:
Du Peng 2022-06-01 10:45:24 +02:00
parent c9613b6f82
commit c5ba1afe8d
2 changed files with 4 additions and 2 deletions

View File

@ -12,6 +12,7 @@
- Fix a bug: unable to create OIDC custom scopes
- Fix a bug: enable admins to be invited to collaborate on projects
- Fix a bug: hide some links to create an account if public registrations is disabled
- Fix a bug: unable to save user validation if admin click save user profile button after switch user valitation
- Fix a security issue: updated rack to 2.2.3.1 to fix [CVE-2022-30123](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-30123) and [CVE-2022-30122](https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-30122)

View File

@ -245,7 +245,8 @@ class API::MembersController < API::ApiController
members_service = Members::MembersService.new(@member)
if members_service.validate(user_params[:validated_at].present?)
uparams = params.require(:user).permit(:validated_at)
if members_service.validate(uparams[:validated_at].present?)
render :show, status: :ok, location: member_path(@member)
else
render json: @member.errors, status: :unprocessable_entity
@ -275,7 +276,7 @@ class API::MembersController < API::ApiController
elsif current_user.admin? || current_user.manager?
params.require(:user).permit(:username, :email, :password, :password_confirmation, :is_allow_contact, :is_allow_newsletter, :group_id,
:validated_at, tag_ids: [],
tag_ids: [],
profile_attributes: [:id, :first_name, :last_name, :phone, :interest, :software_mastered, :website, :job,
:facebook, :twitter, :google_plus, :viadeo, :linkedin, :instagram, :youtube, :vimeo,
:dailymotion, :github, :echosciences, :pinterest, :lastfm, :flickr,