diff --git a/atst/routes/applications/new.py b/atst/routes/applications/new.py index 413e0d4e..fe160d65 100644 --- a/atst/routes/applications/new.py +++ b/atst/routes/applications/new.py @@ -111,7 +111,7 @@ def view_new_application_step_2(portfolio_id, application_id): "application": application, } - return render_template("portfolios/applications/new/step_2.html", **render_args) + return render_template("applications/new/step_2.html", **render_args) @applications_bp.route( @@ -153,7 +153,7 @@ def view_new_application_step_3(application_id): new_member_form = get_new_member_form(application) return render_template( - "portfolios/applications/new/step_3.html", + "applications/new/step_3.html", application_id=application_id, application=application, members=members, @@ -165,7 +165,7 @@ def view_new_application_step_3(application_id): @user_can(Permissions.CREATE_APPLICATION, message="view create new application form") def update_new_application_step_3(application_id): - handle_create_member(application_id, http_request) + handle_create_member(application_id, http_request.form) return redirect( url_for( diff --git a/templates/portfolios/applications/new/step_3.html b/templates/applications/new/step_3.html similarity index 82% rename from templates/portfolios/applications/new/step_3.html rename to templates/applications/new/step_3.html index ac55d077..c963beee 100644 --- a/templates/portfolios/applications/new/step_3.html +++ b/templates/applications/new/step_3.html @@ -1,7 +1,7 @@ -{% extends "portfolios/applications/base.html" %} +{% extends "applications/base.html" %} -{% from "portfolios/applications/fragments/members.html" import MemberManagementTemplate %} +{% from "fragments/members.html" import MemberManagementTemplate %} {% set secondary_breadcrumb = 'portfolios.applications.new_application_title' | translate %} {% block portfolio_header %} diff --git a/templates/applications/settings.html b/templates/applications/settings.html index da8f65ca..e4c51f2c 100644 --- a/templates/applications/settings.html +++ b/templates/applications/settings.html @@ -5,7 +5,7 @@ {% from "components/icon.html" import Icon %} {% import "applications/fragments/new_member_modal_content.html" as member_steps %} {% from "applications/fragments/member_perms_form_fields.html" import MemberPermsFields %} -{% from "portfolios/applications/fragments/members.html" import MemberManagementTemplate %} +{% from "fragments/members.html" import MemberManagementTemplate %} {% from "components/modal.html" import Modal %} {% from "components/multi_step_modal_form.html" import MultiStepModalForm %} {% from "components/pagination.html" import Pagination %} diff --git a/templates/portfolios/applications/fragments/members.html b/templates/fragments/members.html similarity index 96% rename from templates/portfolios/applications/fragments/members.html rename to templates/fragments/members.html index 9380d9d2..31848326 100644 --- a/templates/portfolios/applications/fragments/members.html +++ b/templates/fragments/members.html @@ -1,7 +1,7 @@ {% from "components/alert.html" import Alert %} {% from "components/icon.html" import Icon %} -{% import "fragments/applications/new_member_modal_content.html" as member_steps %} -{% from "fragments/applications/member_perms_form_fields.html" import MemberPermsFields %} +{% import "applications/fragments/new_member_modal_content.html" as member_steps %} +{% from "applications/fragments/member_perms_form_fields.html" import MemberPermsFields %} {% from "components/modal.html" import Modal %} {% from "components/multi_step_modal_form.html" import MultiStepModalForm %} {% from "components/save_button.html" import SaveButton %} @@ -126,7 +126,7 @@ {% if user_can_create_app_member %} - {% import "fragments/applications/new_member_modal_content.html" as member_steps %} + {% import "applications/fragments/new_member_modal_content.html" as member_steps %} {{ MultiStepModalForm( name=new_member_modal_name, form=new_member_form,