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

Change variable name from data to user_info because it was more descriptive

Browse Source
This commit is contained in:
leigh-mil 2019-08-13 14:22:43 -04:00
parent 87b173b035
commit 852046a3e7
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/routes/ccpo.py
View File

@ -26,8 +26,8 @@ def activity_history():
@user_can(Permissions.VIEW_CCPO_USER, message="view ccpo users") @user_can(Permissions.VIEW_CCPO_USER, message="view ccpo users")
def users(): def users():
users = Users.get_ccpo_users() users = Users.get_ccpo_users()
data = [(user, CCPOUserForm(obj=user)) for user in users] users_info = [(user, CCPOUserForm(obj=user)) for user in users]
return render_template("ccpo/users.html", data=data) return render_template("ccpo/users.html", users_info=users_info)
@bp.route("/ccpo-users/new") @bp.route("/ccpo-users/new")

8
templates/ccpo/users.html
View File

@ -25,9 +25,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for user_data in data %} {% for user, form in users_info %}
{% set user = user_data[0] %}
{% set form = user_data[1] %}
{% set modal_id = "disable_ccpo_user_{}".format(user.dod_id) %} {% set modal_id = "disable_ccpo_user_{}".format(user.dod_id) %}
{% set disable_button_class = 'button-danger-outline' %} {% set disable_button_class = 'button-danger-outline' %}
{% if user == g.current_user %} {% if user == g.current_user %}
@ -58,9 +56,7 @@
{% endif %} {% endif %}
{% if user_can(permissions.DELETE_CCPO_USER) %} {% if user_can(permissions.DELETE_CCPO_USER) %}
{% for user_data in data %} {% for user, form in users_info %}
{% set user = user_data[0] %}
{% set form = user_data[1] %}
{% set modal_id = "disable_ccpo_user_{}".format(user.dod_id) %} {% set modal_id = "disable_ccpo_user_{}".format(user.dod_id) %}
{% call Modal(name=modal_id) %} {% call Modal(name=modal_id) %}
{{ {{