openinfra/refstack
Code Issues Proposed changes

Fixin spaces

Browse Source
This commit is contained in:
Joshua McKenty
2013-04-17 13:40:42 -07:00
parent b3a450d86b
commit b74fb8c4c8
2 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fabfile.py vendored
View File

@@ -19,5 +19,5 @@ def deploy():
run('git checkout master') run('git checkout master')
run('git pull') run('git pull')
run('sudo pip install -r requirements.txt') run('sudo pip install -r requirements.txt')
run('sudo python -c "from refstack import web; web.init_db()"') run('sudo python -c "from refstack import web; web.db.create_all()"')
run('sudo uwsgi --reload /tmp/project-master_refstack.pid') run('sudo uwsgi --reload /tmp/project-master_refstack.pid')

42
refstack/web.py
View File

@@ -17,42 +17,20 @@ app.debug = True
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////var/www/refstack/database.db' app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:////var/www/refstack/database.db'
db = SQLAlchemy(app) db = SQLAlchemy(app)
class Vendor(db.Model): class Vendor(db.Model):
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
vendor_name = db.Column(db.String(80), unique=True) vendor_name = db.Column(db.String(80), unique=True)
contact_email = db.Column(db.String(120), unique=True) contact_email = db.Column(db.String(120), unique=True)
def __init__(self, username, email): def __init__(self, username, email):
self.vendor_name = vendor_name self.vendor_name = vendor_name
self.contact_email = contact_email self.contact_email = contact_email
def __repr__(self):
return '<Vendor %r>' % self.vendor_name
def __repr__(self):
return '<Vendor %r>' % self.vendor_name
#
# @app.before_request
# def before_request():
# g.db = connect_db()
#
# @app.teardown_request
# def teardown_request(exception):
# if hasattr(g, 'db'):
# g.db.close()
#
# def query_db(query, args=(), one=False):
# cur = g.db.execute(query, args)
# rv = [dict((cur.description[idx][0], value)
# for idx, value in enumerate(row)) for row in cur.fetchall()]
# return (rv[0] if rv else None) if one else rv
#
# def init_db():
# with closing(connect_db()) as db:
# with app.open_resource('schema.sql') as f:
# db.cursor().executescript(f.read())
# db.commit()
@app.route('/', methods=['POST','GET']) @app.route('/', methods=['POST','GET'])
def index(): def index():
vendors = Vendor.query.all() vendors = Vendor.query.all()
return render_template('index.html', vendors = vendors) return render_template('index.html', vendors = vendors)