pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor routes

Browse Source
This commit is contained in:
graham-dds 2019-10-02 16:04:27 -04:00
parent 9d34f11d84
commit 2d28356cdc
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
atst/routes/applications/new.py
View File

@ -37,11 +37,9 @@ def render_new_application_form(
@applications_bp.route("/portfolios/<portfolio_id>/applications/new") @applications_bp.route("/portfolios/<portfolio_id>/applications/new")
@applications_bp.route( @applications_bp.route("/applications/<application_id>/new/step_1")
"/portfolios/<portfolio_id>/applications/<application_id>/step_1"
)
@user_can(Permissions.CREATE_APPLICATION, message="view create new application form") @user_can(Permissions.CREATE_APPLICATION, message="view create new application form")
def view_new_application_step_1(portfolio_id, application_id=None): def view_new_application_step_1(portfolio_id=None, application_id=None):
return render_new_application_form( return render_new_application_form(
"applications/new/step_1.html", "applications/new/step_1.html",
NameAndDescriptionForm, NameAndDescriptionForm,
@ -56,13 +54,12 @@ def view_new_application_step_1(portfolio_id, application_id=None):
methods=["POST"], methods=["POST"],
) )
@applications_bp.route( @applications_bp.route(
"/portfolios/<portfolio_id>/applications/<application_id>/step_1", "/applications/<application_id>/new/step_1",
endpoint="update_new_application_step_1", endpoint="update_new_application_step_1",
methods=["POST"], methods=["POST"],
) )
@user_can(Permissions.CREATE_APPLICATION, message="view create new application form") @user_can(Permissions.CREATE_APPLICATION, message="view create new application form")
def create_or_update_new_application_step_1(portfolio_id, application_id=None): def create_or_update_new_application_step_1(portfolio_id=None, application_id=None):
portfolio = Portfolios.get_for_update(portfolio_id)
form = get_new_application_form( form = get_new_application_form(
{**http_request.form}, NameAndDescriptionForm, application_id {**http_request.form}, NameAndDescriptionForm, application_id
) )
@ -73,11 +70,11 @@ def create_or_update_new_application_step_1(portfolio_id, application_id=None):
application = Applications.get(application_id) application = Applications.get(application_id)
application = Applications.update(application, form.data) application = Applications.update(application, form.data)
else: else:
portfolio = Portfolios.get_for_update(portfolio_id)
application = Applications.create(g.current_user, portfolio, **form.data) application = Applications.create(g.current_user, portfolio, **form.data)
return redirect( return redirect(
url_for( url_for(
"applications.update_new_application_step_2", "applications.update_new_application_step_2",
portfolio_id=portfolio_id,
application_id=application.id, application_id=application.id,
) )
) )
@ -94,11 +91,9 @@ def create_or_update_new_application_step_1(portfolio_id, application_id=None):
) )
@applications_bp.route( @applications_bp.route("/applications/<application_id>/new/step_2")
"/portfolios/<portfolio_id>/applications/<application_id>/step_2"
)
@user_can(Permissions.CREATE_APPLICATION, message="view create new application form") @user_can(Permissions.CREATE_APPLICATION, message="view create new application form")
def view_new_application_step_2(portfolio_id, application_id): def view_new_application_step_2(application_id):
application = Applications.get(application_id) application = Applications.get(application_id)
render_args = { render_args = {
"form": EnvironmentsForm( "form": EnvironmentsForm(
@ -114,11 +109,9 @@ def view_new_application_step_2(portfolio_id, application_id):
return render_template("applications/new/step_2.html", **render_args) return render_template("applications/new/step_2.html", **render_args)
@applications_bp.route( @applications_bp.route("/applications/<application_id>/new/step_2", methods=["POST"])
"/portfolios/<portfolio_id>/applications/<application_id>/step_2", methods=["POST"]
)
@user_can(Permissions.CREATE_APPLICATION, message="view create new application form") @user_can(Permissions.CREATE_APPLICATION, message="view create new application form")
def update_new_application_step_2(portfolio_id, application_id): def update_new_application_step_2(application_id):
form = get_new_application_form( form = get_new_application_form(
{**http_request.form}, EnvironmentsForm, application_id {**http_request.form}, EnvironmentsForm, application_id
) )
@ -135,17 +128,13 @@ def update_new_application_step_2(portfolio_id, application_id):
else: else:
return ( return (
render_new_application_form( render_new_application_form(
"applications/new/step_2.html", "applications/new/step_2.html", EnvironmentsForm, application_id, form
EnvironmentsForm,
portfolio_id,
application_id,
form,
), ),
400, 400,
) )
@applications_bp.route("/applications/<application_id>/step_3") @applications_bp.route("/applications/<application_id>/new/step_3")
@user_can(Permissions.CREATE_APPLICATION, message="view create new application form") @user_can(Permissions.CREATE_APPLICATION, message="view create new application form")
def view_new_application_step_3(application_id): def view_new_application_step_3(application_id):
application = Applications.get(application_id) application = Applications.get(application_id)
@ -161,7 +150,7 @@ def view_new_application_step_3(application_id):
) )
@applications_bp.route("/applications/<application_id>/step_3", methods=["POST"]) @applications_bp.route("/applications/<application_id>/new/step_3", methods=["POST"])
@user_can(Permissions.CREATE_APPLICATION, message="view create new application form") @user_can(Permissions.CREATE_APPLICATION, message="view create new application form")
def update_new_application_step_3(application_id): def update_new_application_step_3(application_id):