diff options
Diffstat (limited to 'app/model.py')
-rw-r--r-- | app/model.py | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/app/model.py b/app/model.py index ebf3d5b..4c00878 100644 --- a/app/model.py +++ b/app/model.py @@ -2,8 +2,6 @@ from flask.ext.sqlalchemy import SQLAlchemy from sqlalchemy import sql from sqlalchemy.ext.declarative import declared_attr -from passlib.apps import custom_app_context as pwd_context - import datetime import decimal from functools import partial @@ -51,32 +49,17 @@ class Model (db.Model): return cls.query.get_or_404(*args, **kwargs) class User (Model): + __abstract__ = True name = ReqColumn(db.Unicode(50), unique = True) pwd = ReqColumn(db.Unicode(255)) alias = Column(db.Unicode(50)) - def check_password(self, pwd): - return pwd_context.verify(pwd, self.pwd) - - # Stuff needed for LoginManager - def is_authenticated(self): - return True - - def is_active(self): - return True - - def is_anonymous(self): - return False - - def get_id(self): - return unicode(self.id) - class UserModel (Model): __abstract__ = True @declared_attr def user_id(cls): - return ReqColumn(db.Integer, db.ForeignKey(User.id)) + return ReqColumn(db.Integer, db.ForeignKey('user.id')) @declared_attr def user(cls): @@ -112,10 +95,6 @@ class Expense (UserModel): expense = ReqColumn(ExpNum) @declared_attr - def user_id(cls): - return ReqColumn(db.Integer, db.ForeignKey(User.id)) - - @declared_attr def category_id(cls): return ReqColumn(db.Integer, db.ForeignKey(Category.id)) |