Skip to content

Commit 2e52a37

Browse files
author
App Generator
committed
Rename model User to Users
1 parent 6fa0886 commit 2e52a37

File tree

3 files changed

+13
-21
lines changed

3 files changed

+13
-21
lines changed

app/models.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
from app import db
77
from flask_login import UserMixin
88

9-
class User(UserMixin, db.Model):
9+
class Users(db.Model, UserMixin):
10+
11+
__tablename__ = 'Users'
1012

1113
id = db.Column(db.Integer, primary_key=True)
1214
user = db.Column(db.String(64), unique = True)

app/util.py

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,17 @@
33
Copyright (c) 2019 - present AppSeed.us
44
"""
55

6-
from flask import json, url_for, jsonify, render_template
7-
from jinja2 import TemplateNotFound
8-
from app import app
6+
from flask import json
97

10-
from . models import User
11-
from app import app,db,bc,mail
12-
from . common import *
13-
from sqlalchemy import desc,or_
14-
import hashlib
15-
from flask_mail import Message
16-
import re
17-
from flask import render_template
18-
19-
import os, datetime, time, random
8+
from .models import Users
9+
from app import app,db
10+
from flask import render_template
2011

2112
# build a Json response
2213
def response( data ):
2314
return app.response_class( response=json.dumps(data),
2415
status=200,
2516
mimetype='application/json' )
26-
2717
def g_db_commit( ):
2818

2919
db.session.commit( );

app/views.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
# App modules
1616
from app import app, lm, db, bc
17-
from app.models import User
17+
from app.models import Users
1818
from app.forms import LoginForm, RegisterForm
1919

2020
# provide login manager with load_user callback
2121
@lm.user_loader
2222
def load_user(user_id):
23-
return User.query.get(int(user_id))
23+
return Users.query.get(int(user_id))
2424

2525
# Logout user
2626
@app.route('/logout.html')
@@ -51,10 +51,10 @@ def register():
5151
email = request.form.get('email' , '', type=str)
5252

5353
# filter User out of database through username
54-
user = User.query.filter_by(user=username).first()
54+
user = Users.query.filter_by(user=username).first()
5555

5656
# filter User out of database through username
57-
user_by_email = User.query.filter_by(email=email).first()
57+
user_by_email = Users.query.filter_by(email=email).first()
5858

5959
if user or user_by_email:
6060
msg = 'Error: User exists!'
@@ -63,7 +63,7 @@ def register():
6363

6464
pw_hash = bc.generate_password_hash(password)
6565

66-
user = User(username, email, pw_hash)
66+
user = Users(username, email, pw_hash)
6767

6868
user.save()
6969

@@ -93,7 +93,7 @@ def login():
9393
password = request.form.get('password', '', type=str)
9494

9595
# filter User out of database through username
96-
user = User.query.filter_by(user=username).first()
96+
user = Users.query.filter_by(user=username).first()
9797

9898
if user:
9999

0 commit comments

Comments
 (0)