{% for entry in entries %}
diff --git a/cps/ub.py b/cps/ub.py
index 96e38674..099c05c6 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -70,6 +70,7 @@ SIDEBAR_RECENT = 512
SIDEBAR_SORTED = 1024
MATURE_CONTENT = 2048
SIDEBAR_PUBLISHER = 4096
+SIDEBAR_RATING = 8192
UPDATE_STABLE = 0
AUTO_UPDATE_STABLE = 1
@@ -139,6 +140,9 @@ def get_sidebar_config(kwargs=[]):
"visibility": SIDEBAR_LANGUAGE, 'public': (g.user.filter_language() == 'all'),
"page": "language",
"show_text": _('Show language selection'), "config_show":True})
+ sidebar.append({"glyph": "glyphicon-star-empty", "text": _('Ratings'), "link": 'web.ratings_list', "id": "rate",
+ "visibility": SIDEBAR_RATING, 'public': True,
+ "page": "rating", "show_text": _('Show ratings selection'), "config_show":True})
return sidebar
@@ -835,7 +839,7 @@ def create_admin_user():
user.role = ROLE_USER + ROLE_ADMIN + ROLE_DOWNLOAD + ROLE_UPLOAD + ROLE_EDIT + ROLE_DELETE_BOOKS + ROLE_PASSWD
user.sidebar_view = DETAIL_RANDOM + SIDEBAR_LANGUAGE + SIDEBAR_SERIES + SIDEBAR_CATEGORY + SIDEBAR_HOT + \
SIDEBAR_RANDOM + SIDEBAR_AUTHOR + SIDEBAR_BEST_RATED + SIDEBAR_READ_AND_UNREAD + SIDEBAR_RECENT + \
- SIDEBAR_SORTED + SIDEBAR_PUBLISHER
+ SIDEBAR_SORTED + + MATURE_CONTENT + SIDEBAR_PUBLISHER + SIDEBAR_RATING
user.password = generate_password_hash(DEFAULT_PASS)
diff --git a/cps/web.py b/cps/web.py
index c5bd7600..2f56d4e7 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -501,36 +501,27 @@ def index(page):
@web.route('/books/newest/page/')
@login_required_if_no_ano
def newest_books(page):
- if current_user.show_sorted():
- entries, random, pagination = fill_indexpage(page, db.Books, True, [db.Books.pubdate.desc()])
- return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
- title=_(u"Newest Books"), page="newest")
- else:
- abort(404)
+ entries, random, pagination = fill_indexpage(page, db.Books, True, [db.Books.pubdate.desc()])
+ return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
+ title=_(u"Newest Books"), page="newest")
@web.route('/books/oldest', defaults={'page': 1})
@web.route('/books/oldest/page/')
@login_required_if_no_ano
def oldest_books(page):
- if current_user.show_sorted():
- entries, random, pagination = fill_indexpage(page, db.Books, True, [db.Books.pubdate])
- return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
- title=_(u"Oldest Books"), page="oldest")
- else:
- abort(404)
+ entries, random, pagination = fill_indexpage(page, db.Books, True, [db.Books.pubdate])
+ return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
+ title=_(u"Oldest Books"), page="oldest")
@web.route('/books/a-z', defaults={'page': 1})
@web.route('/books/a-z/page/')
@login_required_if_no_ano
def titles_ascending(page):
- if current_user.show_sorted():
- entries, random, pagination = fill_indexpage(page, db.Books, True, [db.Books.sort])
- return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
- title=_(u"Books (A-Z)"), page="a-z")
- else:
- abort(404)
+ entries, random, pagination = fill_indexpage(page, db.Books, True, [db.Books.sort])
+ return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
+ title=_(u"Books (A-Z)"), page="a-z")
@web.route('/books/z-a', defaults={'page': 1})
@@ -605,7 +596,7 @@ def author_list():
if current_user.check_visibility(ub.SIDEBAR_AUTHOR):
entries = db.session.query(db.Authors, func.count('books_authors_link.book').label('count'))\
.join(db.books_authors_link).join(db.Books).filter(common_filters())\
- .group_by('books_authors_link.author').order_by(db.Authors.sort).all()
+ .group_by(text('books_authors_link.author')).order_by(db.Authors.sort).all()
charlist = db.session.query(func.upper(func.substr(db.Authors.sort,1,1)).label('char')) \
.join(db.books_authors_link).join(db.Books).filter(common_filters()) \
.group_by(func.upper(func.substr(db.Authors.sort,1,1))).all()
@@ -650,7 +641,7 @@ def publisher_list():
if current_user.check_visibility(ub.SIDEBAR_PUBLISHER):
entries = db.session.query(db.Publishers, func.count('books_publishers_link.book').label('count'))\
.join(db.books_publishers_link).join(db.Books).filter(common_filters())\
- .group_by('books_publishers_link.publisher').order_by(db.Publishers.sort).all()
+ .group_by(text('books_publishers_link.publisher')).order_by(db.Publishers.sort).all()
charlist = db.session.query(func.upper(func.substr(db.Publishers.name,1,1)).label('char')) \
.join(db.books_publishers_link).join(db.Books).filter(common_filters()) \
.group_by(func.upper(func.substr(db.Publishers.name,1,1))).all()
@@ -704,7 +695,7 @@ def series_list():
if current_user.check_visibility(ub.SIDEBAR_SERIES):
entries = db.session.query(db.Series, func.count('books_series_link.book').label('count'))\
.join(db.books_series_link).join(db.Books).filter(common_filters())\
- .group_by('books_series_link.series').order_by(db.Series.sort).all()
+ .group_by(text('books_series_link.series')).order_by(db.Series.sort).all()
charlist = db.session.query(func.upper(func.substr(db.Series.sort,1,1)).label('char')) \
.join(db.books_series_link).join(db.Books).filter(common_filters()) \
.group_by(func.upper(func.substr(db.Series.sort,1,1))).all()
@@ -728,6 +719,36 @@ def series(book_id, page):
abort(404)
+@web.route("/ratings")
+@login_required_if_no_ano
+def ratings_list():
+ if current_user.check_visibility(ub.SIDEBAR_RATING):
+ entries = db.session.query(db.Series, func.count('books_series_link.book').label('count'))\
+ .join(db.books_series_link).join(db.Books).filter(common_filters())\
+ .group_by(text('books_series_link.series')).order_by(db.Series.sort).all()
+ charlist = db.session.query(func.upper(func.substr(db.Series.sort,1,1)).label('char')) \
+ .join(db.books_series_link).join(db.Books).filter(common_filters()) \
+ .group_by(func.upper(func.substr(db.Series.sort,1,1))).all()
+ return render_title_template('list.html', entries=entries, folder='web.series', charlist=charlist,
+ title=_(u"Ratings list"), page="ratingslist")
+ else:
+ abort(404)
+
+
+@web.route("/ratings//", defaults={'page': 1})
+@web.route("/ratings//")
+@login_required_if_no_ano
+def ratings(book_id, page):
+ name = db.session.query(db.Series).filter(db.Series.id == book_id).first()
+ if name:
+ entries, random, pagination = fill_indexpage(page, db.Books, db.Books.series.any(db.Series.id == book_id),
+ [db.Books.series_index])
+ return render_title_template('index.html', random=random, pagination=pagination, entries=entries,
+ title=_(u"Ratings: %(serie)s", serie=name.name), page="ratings")
+ else:
+ abort(404)
+
+
@web.route("/language")
@login_required_if_no_ano
def language_overview():
@@ -749,7 +770,7 @@ def language_overview():
languages[0].name = _(isoLanguages.get(part3=languages[0].lang_code).name)
lang_counter = db.session.query(db.books_languages_link,
func.count('books_languages_link.book').label('bookcount')).group_by(
- 'books_languages_link.lang_code').all()
+ text('books_languages_link.lang_code')).all()
return render_title_template('languages.html', languages=languages, lang_counter=lang_counter,
charlist=charlist, title=_(u"Available languages"), page="langlist")
else:
@@ -780,7 +801,7 @@ def category_list():
if current_user.check_visibility(ub.SIDEBAR_CATEGORY):
entries = db.session.query(db.Tags, func.count('books_tags_link.book').label('count'))\
.join(db.books_tags_link).join(db.Books).order_by(db.Tags.name).filter(common_filters())\
- .group_by('books_tags_link.tag').all()
+ .group_by(text('books_tags_link.tag')).all()
charlist = db.session.query(func.upper(func.substr(db.Tags.name,1,1)).label('char')) \
.join(db.books_tags_link).join(db.Books).filter(common_filters()) \
.group_by(func.upper(func.substr(db.Tags.name,1,1))).all()