Finish route for confirming CCPO user, add function to update user's ccpo perms, and add success flash message to template
This commit is contained in:
parent
01ba73ef42
commit
811a498bf4
@ -87,6 +87,18 @@ class Users(object):
|
||||
|
||||
return user
|
||||
|
||||
@classmethod
|
||||
def update_ccpo_permissions(cls, user, add_perms=False):
|
||||
if add_perms:
|
||||
permission_sets = PermissionSets.get_all()
|
||||
else:
|
||||
permission_sets = []
|
||||
|
||||
user.permission_sets = permission_sets
|
||||
db.session.add(user)
|
||||
db.session.commit()
|
||||
return user
|
||||
|
||||
@classmethod
|
||||
def update_last_login(cls, user):
|
||||
user.last_login = datetime.now()
|
||||
|
@ -154,7 +154,7 @@ def add_new_ccpo_user():
|
||||
@user_can(Permissions.CREATE_CCPO_USER, message="create ccpo user")
|
||||
def submit_add_new_ccpo_user():
|
||||
try:
|
||||
new_user = Users.get_by_dod_id(request.form['dod_id'])
|
||||
new_user = Users.get_by_dod_id(request.form["dod_id"])
|
||||
form = CCPOUserForm(obj=new_user)
|
||||
except NotFoundError:
|
||||
new_user = None
|
||||
@ -166,9 +166,9 @@ def submit_add_new_ccpo_user():
|
||||
@bp.route("/ccpo-users/confirm-new", methods=["POST"])
|
||||
@user_can(Permissions.CREATE_CCPO_USER, message="create ccpo user")
|
||||
def confirm_new_ccpo_user():
|
||||
new_user = Users.get_by_dod_id(request.form['dod_id'])
|
||||
# give new perms here
|
||||
# flash w/ success message
|
||||
user = Users.get_by_dod_id(request.form["dod_id"])
|
||||
Users.update_ccpo_permissions(user, add_perms=True)
|
||||
flash("ccpo_user_added", user_name=user.full_name)
|
||||
return redirect(url_for("atst.ccpo_users"))
|
||||
|
||||
|
||||
|
@ -122,7 +122,4 @@ def portfolio():
|
||||
|
||||
|
||||
def atat():
|
||||
return {
|
||||
"permissions": Permissions,
|
||||
"user_can": user_can_view,
|
||||
}
|
||||
return {"permissions": Permissions, "user_can": user_can_view}
|
||||
|
@ -30,6 +30,11 @@ MESSAGES = {
|
||||
"message_template": "You have successfully deleted {{ user_name }} from {{ application_name }}",
|
||||
"category": "success",
|
||||
},
|
||||
"ccpo_user_added": {
|
||||
"title_template": translate("flash.success"),
|
||||
"message_template": "You have successfully given {{ user_name }} CCPO permissions.",
|
||||
"category": "success",
|
||||
},
|
||||
"environment_added": {
|
||||
"title_template": translate("flash.success"),
|
||||
"message_template": """
|
||||
|
@ -7,6 +7,9 @@
|
||||
<div class="h2">
|
||||
CCPO Users
|
||||
</div>
|
||||
|
||||
{% include "fragments/flash.html" %}
|
||||
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
|
Loading…
x
Reference in New Issue
Block a user