From 852046a3e719fead449270df89bded855d110491 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Tue, 13 Aug 2019 14:22:43 -0400 Subject: [PATCH] Change variable name from data to user_info because it was more descriptive --- atst/routes/ccpo.py | 4 ++-- templates/ccpo/users.html | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/atst/routes/ccpo.py b/atst/routes/ccpo.py index 553e2a00..a1a3a87c 100644 --- a/atst/routes/ccpo.py +++ b/atst/routes/ccpo.py @@ -26,8 +26,8 @@ def activity_history(): @user_can(Permissions.VIEW_CCPO_USER, message="view ccpo users") def users(): users = Users.get_ccpo_users() - data = [(user, CCPOUserForm(obj=user)) for user in users] - return render_template("ccpo/users.html", data=data) + users_info = [(user, CCPOUserForm(obj=user)) for user in users] + return render_template("ccpo/users.html", users_info=users_info) @bp.route("/ccpo-users/new") diff --git a/templates/ccpo/users.html b/templates/ccpo/users.html index 7e0d2ff8..f5ea52a8 100644 --- a/templates/ccpo/users.html +++ b/templates/ccpo/users.html @@ -25,9 +25,7 @@ - {% for user_data in data %} - {% set user = user_data[0] %} - {% set form = user_data[1] %} + {% for user, form in users_info %} {% set modal_id = "disable_ccpo_user_{}".format(user.dod_id) %} {% set disable_button_class = 'button-danger-outline' %} {% if user == g.current_user %} @@ -58,9 +56,7 @@ {% endif %} {% if user_can(permissions.DELETE_CCPO_USER) %} - {% for user_data in data %} - {% set user = user_data[0] %} - {% set form = user_data[1] %} + {% for user, form in users_info %} {% set modal_id = "disable_ccpo_user_{}".format(user.dod_id) %} {% call Modal(name=modal_id) %} {{