Haldis/haldis
5
0
Fork 0
Code Issues 39 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:ZeusWPI/Foodbot

Browse source
This commit is contained in:
Feliciaan De Palmenaer 2015-03-26 23:18:07 +01:00
commit 70a5874089
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/admin.py
View file

@ -7,7 +7,6 @@ from app import app, db
from models import User, Location, Food, Order, OrderItem from models import User, Location, Food, Order, OrderItem
class ModelBaseView(ModelView): class ModelBaseView(ModelView):
def is_accessible(self): def is_accessible(self):

2
app/models.py
View file

@ -1,5 +1,6 @@
from app import db from app import db
# Create database models # Create database models
class User(db.Model): class User(db.Model):
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
@ -77,7 +78,6 @@ class Order(db.Model):
stoptime = db.Column(db.DateTime) stoptime = db.Column(db.DateTime)
orders = db.relationship('OrderItem', backref='order', lazy='dynamic') orders = db.relationship('OrderItem', backref='order', lazy='dynamic')
def configure(self, courrier, location, starttime, stoptime): def configure(self, courrier, location, starttime, stoptime):
self.courrier = courrier self.courrier = courrier
self.location = location self.location = location