Skip to content
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

Allow WebUser invites to be editable before the invited user accepts it #35538

Merged
merged 14 commits into from
Dec 19, 2024
Merged

Allow WebUser invites to be editable before the invited user accepts it #35538

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4a73e0c
Add support for editing existing webuser invites
minhaminha Dec 4, 2024
a13bfba
Default initVals to empty dict if undefined
minhaminha Dec 6, 2024
71b8fc6
Merge branch 'master' into ml/editable-webuser-invite
minhaminha Dec 6, 2024
c1f1b8e
Refactor email validation logic for editing invites
minhaminha Dec 6, 2024
2471e5b
Check that the invited user has locations assigned before getting pri…
minhaminha Dec 13, 2024
ff8a2db
Merge branch 'master' into ml/editable-webuser-invite
minhaminha Dec 18, 2024
5029d11
Fix typo and initial data when initializing tableauform
minhaminha Dec 18, 2024
dbb5e96
Nit pick refactors
minhaminha Dec 18, 2024
f297dd2
Properly populate tableau related fields when editing
minhaminha Dec 18, 2024
de3df56
More nit pick refactors
minhaminha Dec 19, 2024
1ef0d0e
Even more nit pick refactors
minhaminha Dec 19, 2024
1bee3fc
Fix typos
minhaminha Dec 19, 2024
64a805f
Add initial user data for invites in page_context intead of shared ge…
minhaminha Dec 19, 2024
44696ad
Make tableau fields on invite edit page readonly based on user permis…
minhaminha Dec 19, 2024
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
4 changes: 3 additions & 1 deletion corehq/apps/users/views/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1144,7 +1144,9 @@ def invite_web_user_form(self):
if invitation:
assigned_location = invitation.assigned_locations.filter()
assigned_location_ids = [loc.location_id for loc in assigned_location]
primary_location_id = invitation.primary_location.location_id
primary_location_id = None
if assigned_location_ids:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this check primary_location instead of assigned_location_ids? It should work the same in either case, just seems clearer

primary_location_id = invitation.primary_location.location_id
initial = {
'email': invitation.email,
'role': invitation.role,
Expand Down