ddp/books
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved DB error handling

Browse Source
This commit is contained in:
Damien De Paoli
2020-12-30 23:12:36 +11:00
parent 60b7484afb
commit af6c76d136
5 changed files with 76 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
covertype.py
View File

@@ -3,6 +3,7 @@ from flask import request, render_template, redirect
from flask_wtf import FlaskForm
from __main__ import db, app, ma
from sqlalchemy import func, Sequence
from sqlalchemy.exc import SQLAlchemyError
from status import st, Status
################################################################################
@@ -46,14 +47,21 @@ def covertypes():
@app.route("/covertype", methods=["GET", "POST"])
def new_covertype():
form = CovertypeForm(request.form)
page_title='Create new Covertype'
if 'name' not in request.form:
return render_template("edit_id_name.html", form=form, page_title='Create new Covertype' )
return render_template("edit_id_name.html", form=form, page_title=page_title )
else:
covertype = Covertype( name=request.form["name"] )
db.session.add(covertype)
db.session.commit()
st.SetMessage( "Created new Covertype (id={})".format(covertype.id) )
return redirect( '/covertypes' )
try:
db.session.add(covertype)
db.session.commit()
st.SetMessage( "Created new Covertype (id={})".format(covertype.id) )
return redirect( '/covertypes' )
except SQLAlchemyError as e:
st.SetAlert( "danger" )
st.SetMessage( "<b>Failed to add covertype:</b>&nbsp;{}".format( e.orig) )
return render_template("edit_id_name.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
################################################################################
# /covertype/<id> -> GET/POST(save or delete) -> shows/edits/delets a single covertype
@@ -62,20 +70,26 @@ def new_covertype():
def covertype(id):
### DDP: should this be request.form or request.values?
form = CovertypeForm(request.form)
page_title='Edit Covertype'
if request.method == 'POST' and form.validate():
covertype = Covertype.query.get(id)
if 'delete' in request.form:
st.SetMessage("Successfully deleted (id={}, name={})".format( covertype.id, covertype.name ) )
covertype = Covertype.query.filter(Covertype.id==id).delete()
if 'submit' in request.form:
st.SetMessage("Successfully Updated Covertype (id={})".format(id) )
covertype.name = request.form['name']
db.session.commit()
return redirect( '/covertypes' )
try:
covertype = Covertype.query.get(id)
if 'delete' in request.form:
st.SetMessage("Successfully deleted (id={}, name={})".format( covertype.id, covertype.name ) )
covertype = Covertype.query.filter(Covertype.id==id).delete()
if 'submit' in request.form:
st.SetMessage("Successfully Updated Covertype (id={})".format(id) )
covertype.name = request.form['name']
db.session.commit()
return redirect( '/covertypes' )
except SQLAlchemyError as e:
st.SetAlert( "danger" )
st.SetMessage( "<b>Failed to modify Covertype:</b>&nbsp;{}".format(e.orig) )
return render_template("edit_id_name.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
else:
covertype = Covertype.query.get(id)
form = CovertypeForm(request.values, obj=covertype)
return render_template("edit_id_name.html", form=form, page_title='Edit Covertype' )
return render_template("edit_id_name.html", form=form, page_title=page_title )
################################################################################
# Gets the Covertype matching id from DB, helper func in jinja2 code to show books