diff --git a/publisher.py b/publisher.py
index ee1fdda..372b162 100644
--- a/publisher.py
+++ b/publisher.py
@@ -2,7 +2,8 @@ from wtforms import SubmitField, StringField, HiddenField, SelectField, validato
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 import Sequence
+from sqlalchemy.exc import SQLAlchemyError
from status import st, Status
################################################################################
@@ -46,14 +47,20 @@ def publishers():
@app.route("/publisher", methods=["GET", "POST"])
def new_publisher():
form = PublisherForm(request.form)
+ page_title='Create new Publisher'
if 'name' not in request.form:
- return render_template("edit_id_name.html", form=form, page_title='Create new Publisher' )
+ return render_template("edit_id_name.html", form=form, page_title=page_title )
else:
publisher = Publisher( name=request.form["name"] )
- db.session.add(publisher)
- db.session.commit()
- st.SetMessage( "Created new Publisher (id={})".format(publisher.id) )
- return redirect( '/publishers' )
+ try:
+ db.session.add(publisher)
+ db.session.commit()
+ st.SetMessage( "Created new Publisher (id={})".format(publisher.id) )
+ return redirect( '/publishers' )
+ except SQLAlchemyError as e:
+ st.SetAlert( "danger" )
+ st.SetMessage( "Failed to add Publisher: {}".format( e.orig) )
+ return render_template("edit_id_name.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
################################################################################
# /publisher/ -> GET/POST(save or delete) -> shows/edits/delets a single publisher
@@ -62,20 +69,26 @@ def new_publisher():
def publisher(id):
### DDP: should this be request.form or request.values?
form = PublisherForm(request.form)
+ page_title='Edit Publisher'
if request.method == 'POST' and form.validate():
- publisher = Publisher.query.get(id)
- if 'delete' in request.form:
- st.SetMessage("Successfully deleted (id={}, name={})".format( publisher.id, publisher.name ) )
- publisher = Publisher.query.filter(Publisher.id==id).delete()
- if 'submit' in request.form:
- st.SetMessage("Successfully Updated Publisher (id={})".format(id) )
- publisher.name = request.form['name']
- db.session.commit()
- return redirect( '/publishers' )
+ try:
+ publisher = Publisher.query.get(id)
+ if 'delete' in request.form:
+ st.SetMessage("Successfully deleted (id={}, name={})".format( publisher.id, publisher.name ) )
+ publisher = Publisher.query.filter(Publisher.id==id).delete()
+ if 'submit' in request.form:
+ st.SetMessage("Successfully Updated Publisher (id={})".format(id) )
+ publisher.name = request.form['name']
+ db.session.commit()
+ return redirect( '/publishers' )
+ except SQLAlchemyError as e:
+ st.SetAlert( "danger" )
+ st.SetMessage( "Failed to modify Publisher: {}".format(e.orig) )
+ return render_template("edit_id_name.html", form=form, page_title=page_title, alert=st.GetAlert(), message=st.GetMessage() )
else:
publisher = Publisher.query.get(id)
form = PublisherForm(request.values, obj=publisher)
- return render_template("edit_id_name.html", form=form, page_title='Edit Publisher' )
+ return render_template("edit_id_name.html", form=form, page_title=page_title )
################################################################################
# Gets the Publisher matching id from DB, helper func in jinja2 code to show books