From 98065710014ba24617446134961f6aa52820bd84 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 16 Jan 2020 10:50:03 -0500
Subject: [PATCH] Refactoring: - Set dict values directly instead of creating a
 variable - Comment out unused route function entirely - Use f-strings for
 string interpolation - Move div inside if statement so empty divs are not
 printed

---
 atst/routes/portfolios/admin.py               | 44 +++++++++----------
 atst/routes/portfolios/invitations.py         |  4 +-
 .../fragments/portfolio_members.html          |  8 ++--
 3 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/atst/routes/portfolios/admin.py b/atst/routes/portfolios/admin.py
index ff9a4a11..4318a47c 100644
--- a/atst/routes/portfolios/admin.py
+++ b/atst/routes/portfolios/admin.py
@@ -55,18 +55,16 @@ def filter_members_data(members_list):
         }
 
         if not ppoc:
-            update_invite_form = (
+            member_data["update_invite_form"] = (
                 member_forms.NewForm(user_data=member.latest_invitation)
                 if member.latest_invitation and member.latest_invitation.can_resend
                 else member_forms.NewForm()
             )
-            invite_token = (
+            member_data["invite_token"] = (
                 member.latest_invitation.token
                 if member.latest_invitation and member.latest_invitation.can_resend
                 else None
             )
-            member_data["update_invite_form"] = update_invite_form
-            member_data["invite_token"] = invite_token
 
         members_data.append(member_data)
 
@@ -113,25 +111,25 @@ def admin(portfolio_id):
 
 # Updating PPoC is a post-MVP feature
 # @portfolios_bp.route("/portfolios/<portfolio_id>/update_ppoc", methods=["POST"])
-@user_can(Permissions.EDIT_PORTFOLIO_POC, message="update portfolio ppoc")
-def update_ppoc(portfolio_id):  # pragma: no cover
-    role_id = http_request.form.get("role_id")
-
-    portfolio = Portfolios.get(g.current_user, portfolio_id)
-    new_ppoc_role = PortfolioRoles.get_by_id(role_id)
-
-    PortfolioRoles.make_ppoc(portfolio_role=new_ppoc_role)
-
-    flash("primary_point_of_contact_changed", ppoc_name=new_ppoc_role.full_name)
-
-    return redirect(
-        url_for(
-            "portfolios.admin",
-            portfolio_id=portfolio.id,
-            fragment="primary-point-of-contact",
-            _anchor="primary-point-of-contact",
-        )
-    )
+# @user_can(Permissions.EDIT_PORTFOLIO_POC, message="update portfolio ppoc")
+# def update_ppoc(portfolio_id):  # pragma: no cover
+#     role_id = http_request.form.get("role_id")
+#
+#     portfolio = Portfolios.get(g.current_user, portfolio_id)
+#     new_ppoc_role = PortfolioRoles.get_by_id(role_id)
+#
+#     PortfolioRoles.make_ppoc(portfolio_role=new_ppoc_role)
+#
+#     flash("primary_point_of_contact_changed", ppoc_name=new_ppoc_role.full_name)
+#
+#     return redirect(
+#         url_for(
+#             "portfolios.admin",
+#             portfolio_id=portfolio.id,
+#             fragment="primary-point-of-contact",
+#             _anchor="primary-point-of-contact",
+#         )
+#     )
 
 
 @portfolios_bp.route("/portfolios/<portfolio_id>/edit", methods=["POST"])
diff --git a/atst/routes/portfolios/invitations.py b/atst/routes/portfolios/invitations.py
index 54938380..7c48593f 100644
--- a/atst/routes/portfolios/invitations.py
+++ b/atst/routes/portfolios/invitations.py
@@ -67,9 +67,7 @@ def resend_invitation(portfolio_id, portfolio_token):
         )
         flash("resend_portfolio_invitation", user_name=invite.user_name)
     else:
-        user_name = "{} {}".format(
-            form["user_data"]["first_name"].data, form["user_data"]["last_name"].data
-        )
+        user_name = f"{form['user_data']['first_name'].data} {form['user_data']['last_name'].data}"
         flash("resend_portfolio_invitation_error", user_name=user_name)
 
     return redirect(
diff --git a/templates/portfolios/fragments/portfolio_members.html b/templates/portfolios/fragments/portfolio_members.html
index 0e171729..91e99d24 100644
--- a/templates/portfolios/fragments/portfolio_members.html
+++ b/templates/portfolios/fragments/portfolio_members.html
@@ -124,11 +124,11 @@
               </td>
               <td class="toggle-menu__container">
                 {% for perm, value in member.permission_sets.items() -%}
-                  <div>
-                    {% if value -%}
+                  {% if value -%}
+                    <div>
                       {{ ("portfolios.admin.members.{}.{}".format(perm, value)) | translate }}
-                    {%- endif %}
-                  </div>
+                    </div>
+                  {%- endif %}
                 {%-endfor %}
                 {% if user_can(permissions.EDIT_PORTFOLIO_USERS) -%}
                   {% call ToggleMenu() %}