diff --git a/atst/app.py b/atst/app.py index 4413a55f..adf018ed 100644 --- a/atst/app.py +++ b/atst/app.py @@ -84,7 +84,7 @@ def make_flask_callbacks(app): def _set_globals(): g.current_user = None g.dev = os.getenv("FLASK_ENV", "dev") == "dev" - g.matchesPath = lambda href: re.match("^" + href, request.path) + g.matchesPath = lambda href: re.search(href, request.full_path) g.modal = request.args.get("modal", None) g.Authorization = Authorization g.Permissions = Permissions diff --git a/atst/routes/portfolios/members.py b/atst/routes/portfolios/members.py index 46aaf8fb..1db59cfb 100644 --- a/atst/routes/portfolios/members.py +++ b/atst/routes/portfolios/members.py @@ -92,7 +92,12 @@ def create_member(portfolio_id): flash("new_portfolio_member", new_member=member, portfolio=portfolio) return redirect( - url_for("portfolios.portfolio_members", portfolio_id=portfolio.id) + url_for( + "portfolios.portfolio_admin", + portfolio_id=portfolio.id, + fragment="portfolio-members", + _anchor="portfolio-members", + ) ) except AlreadyExistsError: return render_template( diff --git a/atst/utils/flash.py b/atst/utils/flash.py index 7b1db8c2..69239977 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -22,10 +22,9 @@ MESSAGES = { "category": "success", }, "new_portfolio_member": { - "title_template": "Member added successfully", + "title_template": "Success!", "message_template": """ -
{{ new_member.user_name }} was successfully invited via email to this portfolio. They do not yet have access to any environments.
- +You have successfully invited {{ new_member.user_name }} to the portfolio admin.
""", "category": "success", }, diff --git a/js/components/forms/multi_step_modal_form.js b/js/components/forms/multi_step_modal_form.js index 8ddac376..4bf540e0 100644 --- a/js/components/forms/multi_step_modal_form.js +++ b/js/components/forms/multi_step_modal_form.js @@ -64,7 +64,7 @@ export default { }, handleModalOpen: function(_bool) { this.step = 0 - } + }, }, computed: {}, diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index acd1c882..539ef47b 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -310,6 +310,10 @@ } } + + .alert { + margin: 4rem; + } } .application-content { diff --git a/templates/fragments/admin/portfolio_members.html b/templates/fragments/admin/portfolio_members.html index f307c01f..e7ff7be4 100644 --- a/templates/fragments/admin/portfolio_members.html +++ b/templates/fragments/admin/portfolio_members.html @@ -1,10 +1,12 @@ {% from "components/icon.html" import Icon %} {% from "components/options_input.html" import OptionsInput %} -