remove accepted column from workspace_roles

This commit is contained in:
dandds
2018-10-26 16:07:10 -04:00
parent 5c5f9c6c9c
commit b81a831c85
15 changed files with 148 additions and 49 deletions

View File

@@ -48,7 +48,7 @@ def make_error_pages(app):
log_error(e)
return (
render_template(
"error.html", message="The invitation you followed has expired."
"error.html", message="The invitation link you clicked is invalid."
),
404,
)

View File

@@ -340,10 +340,10 @@ def update_member(workspace_id, member_id):
@bp.route("/workspaces/invitation/<invite_id>", methods=["GET"])
def accept_invitation(invite_id):
# TODO: check that the current_user DOD ID matches the user associated with
# the invitation
invite = Invitations.accept(invite_id)
Workspaces.accept_workspace_role(invite.user, invite.workspace)
return redirect(
url_for("workspaces.show_workspace", workspace_id=invite.workspace.id)
)