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

40
owned.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,20 @@ def owneds():
@app.route("/owned", methods=["GET", "POST"])
def new_owned():
form = OwnedForm(request.form)
page_title='Create new Ownership Type'
if 'name' not in request.form:
return render_template("edit_id_name.html", form=form, page_title='Create new Owned Type' )
return render_template("edit_id_name.html", form=form, page_title=page_title )
else:
owned = Owned( name=request.form["name"] )
db.session.add(owned)
db.session.commit()
st.SetMessage( "Created new Owned Type (id={})".format(owned.id) )
return redirect( '/owneds' )
try:
db.session.add(owned)
db.session.commit()
st.SetMessage( "Created new Owned Type (id={})".format(owned.id) )
return redirect( '/owneds' )
except SQLAlchemyError as e:
st.SetAlert( "danger" )
st.SetMessage( "<b>Failed to add Ownership type:</b>&nbsp;{}".format( e.orig) )
return render_template("edit_id_name.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
################################################################################
# /owned/<id> -> GET/POST(save or delete) -> shows/edits/delets a single owned
@@ -63,15 +70,20 @@ def owned(id):
### DDP: should this be request.form or request.values?
form = OwnedForm(request.form)
if request.method == 'POST' and form.validate():
owned = Owned.query.get(id)
if 'delete' in request.form:
st.SetMessage("Successfully deleted (id={}, name={})".format( owned.id, owned.name ) )
owned = Owned.query.filter(Owned.id==id).delete()
if 'submit' in request.form:
owned.name = request.form['name']
st.SetMessage("Successfully Updated Owned (id={})".format(id) )
db.session.commit()
return redirect( '/owneds' )
try:
owned = Owned.query.get(id)
if 'delete' in request.form:
st.SetMessage("Successfully deleted (id={}, name={})".format( owned.id, owned.name ) )
owned = Owned.query.filter(Owned.id==id).delete()
if 'submit' in request.form:
owned.name = request.form['name']
st.SetMessage("Successfully Updated Owned (id={})".format(id) )
db.session.commit()
return redirect( '/owneds' )
except SQLAlchemyError as e:
st.SetAlert( "danger" )
st.SetMessage( "<b>Failed to modify Ownership Type:</b>&nbsp;{}".format(e.orig) )
return render_template("edit_id_name.html", form=form, page_title='Edit Ownership Type', alert=st.GetAlert(), message=st.GetMessage() )
else:
obj = Owned.query.get(id)
form = OwnedForm(request.values, obj=obj)