Merge pull request #836 from dod-ccpo/sidebar

Applications users were invited to were not showing in the portfolios sidebar

atst/routes/applications/index.py

@@ -15,6 +15,7 @@ def has_portfolio_applications(_user, portfolio=None, **_kwargs):
         return True
 
 
+@applications_bp.route("/portfolios/<portfolio_id>")
 @applications_bp.route("/portfolios/<portfolio_id>/applications")
 @user_can(
     Permissions.VIEW_APPLICATION,

atst/routes/portfolios/index.py

@@ -1,6 +1,6 @@
 from datetime import date, timedelta
 
-from flask import render_template, request as http_request, g, redirect, url_for
+from flask import render_template, request as http_request, g
 
 from . import portfolios_bp
 from atst.domain.reports import Reports
@@ -19,14 +19,6 @@ def portfolios():
         return render_template("portfolios/blank_slate.html")
 
 
-@portfolios_bp.route("/portfolios/<portfolio_id>")
-@user_can(Permissions.VIEW_PORTFOLIO, message="view portfolio")
-def show_portfolio(portfolio_id):
-    return redirect(
-        url_for("applications.portfolio_applications", portfolio_id=portfolio_id)
-    )
-
-
 @portfolios_bp.route("/portfolios/<portfolio_id>/reports")
 @user_can(Permissions.VIEW_PORTFOLIO_REPORTS, message="view portfolio reports")
 def reports(portfolio_id):

atst/routes/portfolios/invitations.py

@@ -30,7 +30,7 @@ def accept_invitation(portfolio_token):
             )
 
     return redirect(
-        url_for("portfolios.show_portfolio", portfolio_id=invite.portfolio.id)
+        url_for("applications.portfolio_applications", portfolio_id=invite.portfolio.id)
     )