Use tuple instead of a dict for the user data and form
This commit is contained in:
@@ -26,9 +26,7 @@ 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 = {}
|
data = [(user, CCPOUserForm(obj=user)) for user in users]
|
||||||
for user in users:
|
|
||||||
data[user] = CCPOUserForm(obj=user)
|
|
||||||
return render_template("ccpo/users.html", data=data)
|
return render_template("ccpo/users.html", data=data)
|
||||||
|
|
||||||
|
|
||||||
|
@@ -25,7 +25,9 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{% for user, form in data.items() %}
|
{% for user_data in data %}
|
||||||
|
{% 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 %}
|
||||||
@@ -56,7 +58,9 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% if user_can(permissions.DELETE_CCPO_USER) %}
|
{% if user_can(permissions.DELETE_CCPO_USER) %}
|
||||||
{% for user, form in data.items() %}
|
{% for user_data in data %}
|
||||||
|
{% 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) %}
|
||||||
{{
|
{{
|
||||||
|
Reference in New Issue
Block a user