diff --git a/yadc/__init__.py b/yadc/__init__.py index 4f6af4a..928fa6d 100644 --- a/yadc/__init__.py +++ b/yadc/__init__.py @@ -27,6 +27,7 @@ def create_app(): POST_LIST_THUMB_HEIGHT=200, POST_UPLOADS=os.path.join(app.instance_path, 'post'), INSTANCE_NAME='YADC', + POSTS_PER_PAGE=8, SQLALCHEMY_ECHO=True, ) diff --git a/yadc/bp/main.py b/yadc/bp/main.py index c1b8d67..c839d04 100644 --- a/yadc/bp/main.py +++ b/yadc/bp/main.py @@ -59,15 +59,13 @@ def posts(page): # page = int(args.get('page') or 1) return (tags, matched_ratings) - posts_on_page = 1 - f_tags, f_rating = parse_args() posts_query = Post.query if len(f_tags)>0: posts_query = posts_query.join(Post.tags).group_by(Post.id).filter(Tag.content.in_(f_tags)).having(func.count(Post.id)==len(f_tags)) posts_query = posts_query.filter(Post.rating.in_(f_rating)).order_by(Post.created) #.offset((page-1)*posts_on_page).limit(posts_on_page) - posts = posts_query.paginate(page, posts_on_page) + posts = posts_query.paginate(page, app.config.get('POSTS_PER_PAGE')) tags = tags_prepare(posts.items) flash(parse_args())