From d70332836b7c7bdfbedde677118530408f266e68 Mon Sep 17 00:00:00 2001
From: Montana <montana-ctr@friends.dds.mil>
Date: Fri, 29 Mar 2019 12:01:15 -0400
Subject: [PATCH] Only flash when permissions change

---
 atst/routes/portfolios/index.py                  | 6 +++++-
 templates/fragments/admin/portfolio_members.html | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/atst/routes/portfolios/index.py b/atst/routes/portfolios/index.py
index 66bcfa82..8dc37ade 100644
--- a/atst/routes/portfolios/index.py
+++ b/atst/routes/portfolios/index.py
@@ -95,6 +95,7 @@ def portfolio_admin(portfolio_id):
 def edit_portfolio_members(portfolio_id):
     portfolio = Portfolios.get_for_update(portfolio_id)
     member_perms_form = member_forms.MembersPermissionsForm(http_request.form)
+    has_changed = False
 
     for subform in member_perms_form.members_permissions:
         new_perm_set = subform.data["permission_sets"]
@@ -102,8 +103,10 @@ def edit_portfolio_members(portfolio_id):
         portfolio_role = PortfolioRoles.get(portfolio.id, user_id)
         if portfolio_role.permission_sets != new_perm_set:
             PortfolioRoles.update(portfolio_role, new_perm_set)
+            has_changed = True
 
-    flash("update_portfolio_members", portfolio=portfolio)
+    if has_changed:
+        flash("update_portfolio_members", portfolio=portfolio)
 
     return redirect(
         url_for(
@@ -111,6 +114,7 @@ def edit_portfolio_members(portfolio_id):
             portfolio_id=portfolio.id,
             fragment="portfolio-members",
             _anchor="portfolio-members",
+            has_changed=has_changed,
         )
     )
 
diff --git a/templates/fragments/admin/portfolio_members.html b/templates/fragments/admin/portfolio_members.html
index 08e856e0..6739d8e2 100644
--- a/templates/fragments/admin/portfolio_members.html
+++ b/templates/fragments/admin/portfolio_members.html
@@ -3,7 +3,7 @@
 
 <section class="member-list" id="portfolio-members">
   <div class='responsive-table-wrapper panel'>
-    {% if g.matchesPath("portfolio-members") %}
+    {% if g.matchesPath("portfolio-members") and has_changed %}
       {% include "fragments/flash.html" %}
     {% endif %}
     <form method='POST' id="member-perms" action='{{ url_for("portfolios.edit_portfolio_members", portfolio_id=portfolio.id) }}' autocomplete="off" enctype="multipart/form-data">