Skip to content

Share plan org #2863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raycarrick-ed merged 4 commits into from
Apr 12, 2021
Merged

Share plan org #2863

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f65781b
Merge pull request #121 from DMPRoadmap/master
raycarrick-ed Mar 31, 2021
89d8b82
Merge pull request #122 from DMPRoadmap/master
raycarrick-ed Apr 7, 2021
86a01df
fixup org params for share plan new user
raycarrick-ed Apr 9, 2021
3d5c1cb
rubocop issues
raycarrick-ed Apr 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions app/controllers/users/invitations_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,17 @@ class Users::InvitationsController < Devise::InvitationsController
# Creates the selected Org if necessary and then attaches the invited user
# to the Org after Devise does its thing
prepend_after_action :handle_org, only: [:update]
prepend_before_action :fix_org_params, only: [:update]

protected

def fix_org_params
hash = org_hash_from_params(params_in: params[:user])
org = OrgSelection::HashToOrgService.to_org(hash: hash,
allow_create: false)
params[:user][:org_id] = org.id
end

# Override require_no_authentication method defined at DeviseController
# (parent of Devise::InvitationsController) The following filter gets
# executed any time GET /users/invitation/accept?invitation_token=valid_token
Expand Down