diff options
| author | Frederick Muriuki Muriithi | 2024-06-25 13:19:26 -0500 |
|---|---|---|
| committer | Frederick Muriuki Muriithi | 2024-06-25 13:19:26 -0500 |
| commit | 4883578edd005b203fe67fbea030fcc2ed878923 (patch) | |
| tree | 958531706d8782dd1cefe1385e0a91798f8a5509 | |
| parent | dd7268bc0c2d841779ba488b13ca0b1f0e9ea6bc (diff) | |
| download | genenetwork2-4883578edd005b203fe67fbea030fcc2ed878923.tar.gz | |
Remove flawed "group role" idea: use just "role".
| -rw-r--r-- | gn2/wqflask/oauth2/resources.py | 12 | ||||
| -rw-r--r-- | gn2/wqflask/templates/oauth2/view-resource.html | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/gn2/wqflask/oauth2/resources.py b/gn2/wqflask/oauth2/resources.py index 7ebb82ad..66545802 100644 --- a/gn2/wqflask/oauth2/resources.py +++ b/gn2/wqflask/oauth2/resources.py @@ -213,10 +213,10 @@ def unlink_data_from_resource(): @require_oauth2 def assign_role(resource_id: UUID) -> Response: form = request.form - group_role_id = form.get("group_role_id", "") + role_id = form.get("role_id", "") user_email = form.get("user_email", "") try: - assert bool(group_role_id), "The role must be provided." + assert bool(role_id), "The role must be provided." assert bool(user_email), "The user email must be provided." def __assign_error__(error): @@ -233,7 +233,7 @@ def assign_role(resource_id: UUID) -> Response: return oauth2_post( f"auth/resource/{resource_id}/user/assign", json={ - "group_role_id": group_role_id, + "role_id": role_id, "user_email": user_email }).either(__assign_error__, __assign_success__) except AssertionError as aserr: @@ -244,10 +244,10 @@ def assign_role(resource_id: UUID) -> Response: @require_oauth2 def unassign_role(resource_id: UUID) -> Response: form = request.form - group_role_id = form.get("group_role_id", "") + role_id = form.get("role_id", "") user_id = form.get("user_id", "") try: - assert bool(group_role_id), "The role must be provided." + assert bool(role_id), "The role must be provided." assert bool(user_id), "The user id must be provided." def __unassign_error__(error): @@ -264,7 +264,7 @@ def unassign_role(resource_id: UUID) -> Response: return oauth2_post( f"auth/resource/{resource_id}/user/unassign", json={ - "group_role_id": group_role_id, + "role_id": role_id, "user_id": user_id }).either(__unassign_error__, __unassign_success__) except AssertionError as aserr: diff --git a/gn2/wqflask/templates/oauth2/view-resource.html b/gn2/wqflask/templates/oauth2/view-resource.html index cfc769c4..0788e30c 100644 --- a/gn2/wqflask/templates/oauth2/view-resource.html +++ b/gn2/wqflask/templates/oauth2/view-resource.html @@ -278,14 +278,14 @@ <th>Role</th> <th>Action</th> </tr> - {%for grole in user_row.roles%} + {%for role in user_row.roles%} <tr> <td> <a href="{{url_for( 'oauth2.role.role', - role_id=grole.role_id)}}" - title="Details for '{{grole.role_name}}' role"> - {{grole.role_name}} + role_id=role.role_id)}}" + title="Details for '{{role.role_name}}' role"> + {{role.role_name}} </a> </td> <td> @@ -294,8 +294,8 @@ method="POST"> <input type="hidden" name="user_id" value="{{user_row.user.user_id}}" /> - <input type="hidden" name="group_role_id" - value="{{grole.group_role_id}}"> + <input type="hidden" name="role_id" + value="{{role.role_id}}"> <input type="submit" value="Unassign" class="btn btn-danger" |