21f8ea87e0
Update schema.rb
2 years ago
e12f0a926b
Merge branch 'main' into CLDC-3623-Support-user-bulk-uploading
2 years ago
15e4f79b83
CLDC-3404 Allow support to update user organisation ( #2596 )
...
* Allow support to change user organisation
* Redirect to log-reassignment page when updating organisation
* Add log reassignment page
* Allow setting log reassignment choice
* Add organisation change confirmation page
* Update logs based on log reassignment selection
* Skip log reassignment question if user has no logs
* Send organisation update email
* Update routes in accessibility tests
* Allo moving deactivated users
* Move org field above role
* Only display banner if email has changed
* rescue StandardError
* Only reassign visible logs
* Clean user error messages
* Update pluralization in email
* Mark related bulk uploads as cancelled by user
* Add moved user banner
* Update routing for fix-choice page
* Update pluralization again
2 years ago
4d4b2c6278
Test assigned to validation when support
2 years ago
669a7d0b6f
Fix test
2 years ago
5ad923f9b5
Add support check
2 years ago
981fdb0d82
Add organisation id to bu factory
2 years ago
0f4a8403ff
Revert "turn on duplicate log check on staging ( #2635 )" ( #2639 )
...
* Revert "turn on duplicate log check on staging (#2635 )"
This reverts commit aeb998c537
2 years ago
c3bfadfe7f
Empty bulk upload row parsing ( #2638 )
...
* empty
* Add stripped_row back
* Skip empty rows
2 years ago
dcde5b8336
Validate owning org permitted differently for support users V2
2 years ago
f62018b49c
Validate owning org permitted differently for support users
2 years ago
4b70841e4b
Re add default organisation id
2 years ago
010a729d6f
Revert "Re add default organisation id"
...
This reverts commit 2f62434503
2 years ago
1b96e3c219
Remove redundant logic
2 years ago
2f62434503
Re add default organisation id
2 years ago
33c14ec647
Change incorrect path
2 years ago
29d21d3df5
Add compact
2 years ago
01da83dedb
Fix lint
2 years ago
c45cb160d2
Do not check duplicates on empty rows ( #2636 )
2 years ago
461b64bf00
Start BU flow at start instead of prepare your file
2 years ago
00dd62de22
Change back link
2 years ago
aeb998c537
turn on duplicate log check on staging ( #2635 )
2 years ago
1c3e9d1f8e
Fix lint
2 years ago
cf433046ce
.compact form
2 years ago
2e5d113bef
Changes to how organisation id passed across each view & start on prepare your file page
2 years ago
515eaa5142
Correct assigned to logic
2 years ago
d1258faa6c
Update guidance text ( #2631 )
2 years ago
d38f195a12
Correct wrong name
2 years ago
5c756b2acd
Remove comment and update sales assigned to
2 years ago
24d5aa08b2
Make error message a setup error
2 years ago
8b9c9c71a8
Don't block log creation
2 years ago
b8c1502567
Remove full stops for now 2
2 years ago
a552b52a4a
Revert "Handle back link for checking file page"
...
This reverts commit d3f775eaaa
2 years ago
06dc0e6d53
Remove full stops for now
2 years ago
d3f775eaaa
Handle back link for checking file page
2 years ago
34c4f8cd3b
Merge remote-tracking branch 'origin/CLDC-3623-Support-user-bulk-uploading' into CLDC-3623-Support-user-bulk-uploading
2 years ago
0eb9b11a39
Fix lint
2 years ago
0e6ec911fe
Update error messages
2 years ago
f4ff4c0276
Change back link redirect logic
2 years ago
f9daff50be
Merge branch 'main' into CLDC-3623-Support-user-bulk-uploading
2 years ago
a279b0b0cd
Update row parser, after removing organisation association in bulk upload
2 years ago
dcb5525eb2
Hide bulk upload button for support users in log pages
2 years ago
f971dcae31
Remove return statement to ensure fallback redirection
2 years ago
f2e15b9896
Modify way organisation id is set and back links
2 years ago
c55a5d1952
Test validate_owning_org_permitted & validate empty assigned to (when support uploads)
2 years ago
d1bed1fa14
Test showing bulk upload link for support
2 years ago
27188ad3a2
CLDC-3001 Handle locations and logs on deactivate schemes ( #2605 )
2 years ago
66eeec9453
Merge branch 'main' into CLDC-3623-Support-user-bulk-uploading
2 years ago
4d228240d1
Modify validation to allow support users to bulk upload for other organisations
2 years ago
98ba8878bd
Modify validation to allow support users to bulk upload for other organisations
2 years ago
Manny Dinssa
kosiakkatrina