kavin/Yotter
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

testing typo

Browse Source
This commit is contained in:
pluja 2020-09-04 18:21:57 +02:00
parent eeacc51ec2
commit 0f8aa3c2d4
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/models.py
View File

@ -4,19 +4,19 @@ from flask_login import UserMixin
from werkzeug.security import generate_password_hash, check_password_hash from werkzeug.security import generate_password_hash, check_password_hash
followers = db.Table('followers', followers = db.Table('followers',
db.Column('follower_id', db.Integer, db.ForeignKey('user.id')), db.Column('follower_id', db.Integer, db.ForeignKey('User.id')),
db.Column('followed_id', db.Integer, db.ForeignKey('user.id')) db.Column('followed_id', db.Integer, db.ForeignKey('User.id'))
) )
channel_association = db.Table('channel_association', channel_association = db.Table('channel_association',
db.Column('channel_id', db.String(30), db.ForeignKey('channel.id')), db.Column('channel_id', db.String(30), db.ForeignKey('channel.id')),
db.Column('user_id', db.Integer, db.ForeignKey('user.id')) db.Column('User_id', db.Integer, db.ForeignKey('User.id'))
) # Association: CHANNEL --followed by--> [USERS] ) # Association: CHANNEL --followed by--> [UserS]
twitter_association = db.Table('twitter_association', twitter_association = db.Table('twitter_association',
db.Column('account_id', db.String(30), db.ForeignKey('twitterAccount.id')), db.Column('account_id', db.String(30), db.ForeignKey('twitterAccount.id')),
db.Column('user_id', db.Integer, db.ForeignKey('user.id')) db.Column('User_id', db.Integer, db.ForeignKey('User.id'))
) # Association: ACCOUNT --followed by--> [USERS] ) # Association: ACCOUNT --followed by--> [UserS]
class User(UserMixin, db.Model): class User(UserMixin, db.Model):
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)

4
app/routes.py
View File

@ -486,6 +486,7 @@ def allowed_file(filename):
@app.route('/register', methods=['GET', 'POST']) @app.route('/register', methods=['GET', 'POST'])
def register(): def register():
form = RegistrationForm()
if current_user.is_authenticated: if current_user.is_authenticated:
return redirect(url_for('index')) return redirect(url_for('index'))
@ -496,7 +497,7 @@ def register():
REGISTRATIONS = False REGISTRATIONS = False
except: except:
REGISTRATIONS = True REGISTRATIONS = True
form = RegistrationForm()
if form.validate_on_submit(): if form.validate_on_submit():
if User.query.filter_by(username=form.username.data).first(): if User.query.filter_by(username=form.username.data).first():
flash("This username is taken! Try with another.") flash("This username is taken! Try with another.")
@ -508,6 +509,7 @@ def register():
db.session.commit() db.session.commit()
flash('Congratulations, you are now a registered user!') flash('Congratulations, you are now a registered user!')
return redirect(url_for('login')) return redirect(url_for('login'))
return render_template('register.html', title='Register', registrations=REGISTRATIONS, form=form) return render_template('register.html', title='Register', registrations=REGISTRATIONS, form=form)
@app.route('/error/<errno>') @app.route('/error/<errno>')