pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #426 from dod-ccpo/invite-errors-#161347944

Browse Source 
display error alert for users who had DOD ID conflict when accepting …
This commit is contained in:
dandds 2018-11-05 14:03:01 -05:00 committed by GitHub
commit d78c6de386
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/models/workspace_role.py
View File

@ -57,6 +57,10 @@ class WorkspaceRole(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
else: else:
return "Unknown errors" return "Unknown errors"
@property
def has_dod_id_error(self):
return self.latest_invitation and self.latest_invitation.is_rejected_wrong_user
Index( Index(
"workspace_role_user_workspace", "workspace_role_user_workspace",

4
atst/models/workspace_user.py
View File

@ -37,6 +37,10 @@ class WorkspaceUser(object):
def status(self): def status(self):
return self.workspace_role.display_status return self.workspace_role.display_status
@property
def has_dod_id_error(self):
return self.workspace_role.has_dod_id_error
@property @property
def num_environment_roles(self): def num_environment_roles(self):
return ( return (

5
templates/workspaces/members/edit.html
View File

@ -4,9 +4,14 @@
{% from "components/modal.html" import Modal %} {% from "components/modal.html" import Modal %}
{% from "components/selector.html" import Selector %} {% from "components/selector.html" import Selector %}
{% from "components/options_input.html" import OptionsInput %} {% from "components/options_input.html" import OptionsInput %}
{% from "components/alert.html" import Alert %}
{% block content %} {% block content %}
{% if member.has_dod_id_error %}
{{ Alert('CAC ID Error', message='The member attempted to accept this invite, but their CAC ID did not match the CAC ID you specified on the invite. Please confirm that the DOD ID is accurate.', level='error') }}
{% endif %}
<form method="POST" action="{{ url_for('workspaces.update_member', workspace_id=workspace.id, member_id=member.user_id) }}" autocomplete="false"> <form method="POST" action="{{ url_for('workspaces.update_member', workspace_id=workspace.id, member_id=member.user_id) }}" autocomplete="false">
{{ form.csrf_token }} {{ form.csrf_token }}