Rebecca Law
4ba801edab
Merge branch 'master' into error-handling
...
Conflicts:
app/main/views/invites.py
2016-03-10 15:03:21 +00:00
Rebecca Law
f6d98b63ea
Refactored register_errorhandlers so that it handles HTTPError
...
Remove most cases where we catch HTTPError
2016-03-10 11:53:29 +00:00
Adam Shimali
9523e224bc
Removed links for deleting users. Also removed view function
...
that allowed deletion of users.
2016-03-09 15:30:40 +00:00
Adam Shimali
208c3cbcf3
Added validation to ensure user can't invite themselves.
...
Refactored Invited user form into permissions and invite forms
for use in invite and edit permissions.
Added template for edit permissions.
2016-03-09 13:00:52 +00:00
Adam Shimali
208a586948
Filter out accepted invites in template not client.
2016-03-07 13:59:54 +00:00
Nicholas Staples
b3249831cf
Fix up front end so you can navigate to the edit page.
2016-03-03 15:43:53 +00:00
Nicholas Staples
e5e9db88fd
Functionality_added, tests passing.
2016-03-03 14:32:19 +00:00
Nicholas Staples
9e710711cb
Updated form and fixed existing tests.
2016-03-03 13:00:12 +00:00
Rebecca Law
bfea4a42bc
Merge branch 'master' into cancel-invited-user
...
Conflicts:
app/notify_client/invite_api_client.py
tests/app/main/views/test_manage_users.py
2016-03-01 18:01:20 +00:00
Rebecca Law
8e6bd2471d
Change method to a get.
...
Fix path param in invite_api_client.cancel_invited_user
2016-03-01 17:00:01 +00:00
Rebecca Law
219c740071
Add button to cancel invitation of invited user.
2016-03-01 16:12:26 +00:00
Adam Shimali
5f3c72729e
[WIP] Start of user accepting invite.
...
This commit only deals with acceptance by
users who are already in system.
Changed invite client to return invited user objects
instead of dictionaries.
Added commented out test. fixed up fixtures to return invited user
object for invites
2016-03-01 14:10:35 +00:00
Adam Shimali
8c10c36f50
Invite user form now posts permissions string to api with
...
data to create invite.
2016-02-29 11:03:35 +00:00
Adam Shimali
c76717942f
Manage user pages now surfaces invited users
...
fetched from api.
2016-02-26 15:34:12 +00:00
Adam Shimali
0de80bba97
[WIP] Invite user form now submits data to api.
2016-02-26 13:07:35 +00:00
Rebecca Law
2905d11fe4
Get users for service to show on the manage team page.
...
Calls api endpoint /service/<service_id>/users to retrieve all users associated with the service
2016-02-24 17:32:15 +00:00
Chris Hill-Scott
bf3f6d7d3e
Fix users page for research
...
For the lab sessions, users should just see themselves as the only user, not
all the fake users (it might confuse them).
2016-02-22 13:39:02 +00:00
Chris Hill-Scott
17b99c9bf2
Add pages to invite, edit, and delete users
...
This takes the original prototype version of this page, and, using the same
fake data (ie nothing is wired up):
- adds an invite users page
- adds an edit (and delete) user page
Both these pages allow the user to set another user’s permissions.
This commit adds images for the ticks and crosses, so we have control over their
appearance.
2016-02-22 13:39:02 +00:00
