orbit-oss/flask
4
5
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'website' of github.com:mitsuhiko/flask into website

Browse source
This commit is contained in:
Armin Ronacher 2010-06-18 16:03:38 +02:00
commit d7d99fae59
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
flask_website/__init__.py
View file

@ -10,15 +10,18 @@ app.secret_key = config.SECRET_KEY
from flask_website.openid_auth import DatabaseOpenIDStore from flask_website.openid_auth import DatabaseOpenIDStore
oid = OpenID(store_factory=DatabaseOpenIDStore) oid = OpenID(store_factory=DatabaseOpenIDStore)
@app.errorhandler(404) @app.errorhandler(404)
def not_found(error): def not_found(error):
return render_template('404.html'), 404 return render_template('404.html'), 404
@app.before_request @app.before_request
def load_currrent_user(): def load_current_user():
g.user = User.query.filter_by(openid=session['openid']).first() \ g.user = User.query.filter_by(openid=session['openid']).first() \
if 'openid' in session else None if 'openid' in session else None
@app.after_request @app.after_request
def remove_db_session(response): def remove_db_session(response):
db_session.remove() db_session.remove()

5
flask_website/views/mailinglist.py
View file

@ -84,10 +84,9 @@ def archive(page):
threads = all_threads[offset:offset + config.THREADS_PER_PAGE] threads = all_threads[offset:offset + config.THREADS_PER_PAGE]
if page != 1 and not threads: if page != 1 and not threads:
abort(404) abort(404)
page_count = int(ceil(len(all_threads) // float(config.THREADS_PER_PAGE)))
return render_template('mailinglist/archive.html', return render_template('mailinglist/archive.html',
page_count=int(ceil(len(all_threads) / page_count=page_count, page=page, threads=threads)
float(config.THREADS_PER_PAGE))),
page=page, threads=threads)
@mailinglist.route('/archive/<int:year>/<int:month>/<int:day>/<slug>/') @mailinglist.route('/archive/<int:year>/<int:month>/<int:day>/<slug>/')