andros/flask-note
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix multiuser

Browse Source
This commit is contained in:
Andros Fenollosa 2016-09-18 13:03:57 +02:00
parent 5dbd6017f3
commit 75c2873ff3
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.org
View File

@ -102,10 +102,12 @@ class Note(db.Model):
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
title = db.Column(db.String(100), unique=True) title = db.Column(db.String(100), unique=True)
text = db.Column(db.Text()) text = db.Column(db.Text())
user_id = db.Column(db.Integer)
def __init__(self, title, text): def __init__(self, title, text, user_id):
self.title = title self.title = title
self.text = text self.text = text
self.user_id = user_id
def __repr__(self): def __repr__(self):
return '<Note {title}>'.format(title=self.title) return '<Note {title}>'.format(title=self.title)

11
src/app.py
View File

@ -6,10 +6,9 @@ from database import db, User, Note
app = Flask(__name__) app = Flask(__name__)
# Decoration: check login in session
def login_required(f): def login_required(f):
# Decoration: check login in session
@wraps(f) @wraps(f)
def decorated_function(*args, **kwargs): def decorated_function(*args, **kwargs):
if 'user_id' not in session: if 'user_id' not in session:
@ -64,7 +63,8 @@ def dashboard(my_param_note=None):
my_notes = my_param_note my_notes = my_param_note
if not my_notes: if not my_notes:
# Nothing found # Nothing found
my_notes = Note.query.order_by(Note.id.desc()).all() my_notes = Note.query.filter_by(
user_id=session['user_id']).order_by(Note.id.desc()).all()
if my_notes: if my_notes:
# Show first result # Show first result
my_main_note = my_notes[0] my_main_note = my_notes[0]
@ -92,7 +92,7 @@ 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 + '%')
)).all()) )).filter_by(user_id=session['user_id']).order_by(Note.id.desc()).all())
@app.route('/new') @app.route('/new')
@ -104,7 +104,8 @@ def new():
@app.route('/new/save', methods=['POST']) @app.route('/new/save', methods=['POST'])
@login_required @login_required
def save_note(): def save_note():
myNote = Note(request.form['title'], request.form['text']) myNote = Note(request.form['title'], request.form[
'text'], session['user_id'])
# Create # Create
db.session.add(myNote) db.session.add(myNote)
db.session.commit() db.session.commit()

4
src/database.py
View File

@ -23,10 +23,12 @@ class Note(db.Model):
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
title = db.Column(db.String(100), unique=True) title = db.Column(db.String(100), unique=True)
text = db.Column(db.Text()) text = db.Column(db.Text())
user_id = db.Column(db.Integer)
def __init__(self, title, text): def __init__(self, title, text, user_id):
self.title = title self.title = title
self.text = text self.text = text
self.user_id = user_id
def __repr__(self): def __repr__(self):
return '<Note {title}>'.format(title=self.title) return '<Note {title}>'.format(title=self.title)