Fix rollback
This commit is contained in:
parent
5a08df6b62
commit
a271efca6e
20
src/app.py
20
src/app.py
@ -7,6 +7,7 @@ from database import db, User, Note
|
|||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
app.secret_key = 'secret'
|
app.secret_key = 'secret'
|
||||||
|
|
||||||
|
|
||||||
def login_required(f):
|
def login_required(f):
|
||||||
# Decoration: check login in session
|
# Decoration: check login in session
|
||||||
@wraps(f)
|
@wraps(f)
|
||||||
@ -26,7 +27,9 @@ def index(data=None):
|
|||||||
@app.route('/login', methods=['POST'])
|
@app.route('/login', methods=['POST'])
|
||||||
def login():
|
def login():
|
||||||
data = dict()
|
data = dict()
|
||||||
if request.form['action'] and request.form['email'] and request.form['password']:
|
if (request.form['action'] and
|
||||||
|
request.form['email'] and
|
||||||
|
request.form['password']):
|
||||||
data['email'] = request.form['email']
|
data['email'] = request.form['email']
|
||||||
data['password'] = request.form['password']
|
data['password'] = request.form['password']
|
||||||
if request.form['action'] == 'signup':
|
if request.form['action'] == 'signup':
|
||||||
@ -38,7 +41,10 @@ def login():
|
|||||||
# Create
|
# Create
|
||||||
my_user = User(data['email'], data['password'])
|
my_user = User(data['email'], data['password'])
|
||||||
db.session.add(my_user)
|
db.session.add(my_user)
|
||||||
|
try:
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
except:
|
||||||
|
db.session.rollback()
|
||||||
else:
|
else:
|
||||||
data['error'] = 'register'
|
data['error'] = 'register'
|
||||||
|
|
||||||
@ -104,7 +110,8 @@ def search():
|
|||||||
|
|
||||||
return dashboard(Note.query.filter(
|
return dashboard(Note.query.filter(
|
||||||
or_(Note.title.like('%' + q + '%'), Note.text.like('%' + q + '%')
|
or_(Note.title.like('%' + q + '%'), Note.text.like('%' + q + '%')
|
||||||
)).filter_by(user_id=session['user_id']).order_by(Note.id.desc()).all())
|
)).filter_by(user_id=session['user_id']).order_by(
|
||||||
|
Note.id.desc()).all())
|
||||||
|
|
||||||
|
|
||||||
@app.route('/new')
|
@app.route('/new')
|
||||||
@ -120,7 +127,10 @@ def save_note():
|
|||||||
'text'], session['user_id'])
|
'text'], session['user_id'])
|
||||||
# Create
|
# Create
|
||||||
db.session.add(myNote)
|
db.session.add(myNote)
|
||||||
|
try:
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
except:
|
||||||
|
db.session.rollback()
|
||||||
|
|
||||||
return redirect(url_for('dashboard'))
|
return redirect(url_for('dashboard'))
|
||||||
|
|
||||||
@ -143,7 +153,10 @@ def edit_note(data=None):
|
|||||||
my_note = Note.query.filter_by(id=request.form['id']).first()
|
my_note = Note.query.filter_by(id=request.form['id']).first()
|
||||||
my_note.title = request.form['title']
|
my_note.title = request.form['title']
|
||||||
my_note.text = request.form['text']
|
my_note.text = request.form['text']
|
||||||
|
try:
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
except:
|
||||||
|
db.session.rollback()
|
||||||
|
|
||||||
return redirect(url_for('dashboard'))
|
return redirect(url_for('dashboard'))
|
||||||
|
|
||||||
@ -167,6 +180,9 @@ def delete_note():
|
|||||||
# Delete
|
# Delete
|
||||||
my_note = Note.query.filter_by(id=id).first()
|
my_note = Note.query.filter_by(id=id).first()
|
||||||
db.session.delete(my_note)
|
db.session.delete(my_note)
|
||||||
|
try:
|
||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
except:
|
||||||
|
db.session.rollback()
|
||||||
|
|
||||||
return redirect(url_for('dashboard', id=id))
|
return redirect(url_for('dashboard', id=id))
|
||||||
|
Loading…
Reference in New Issue
Block a user