diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index 44586f38..9a186eb0 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -141,30 +141,6 @@
- {% if downloads %}
-
-
-
{{_('Recent Downloads')}}
-
- {% for entry in downloads %}
-
- {% endfor %}
-
-
-
- {% endif %}
-
@@ -204,5 +180,4 @@
-
{% endblock %}
diff --git a/cps/web.py b/cps/web.py
index 38031cc0..825772cd 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -999,11 +999,11 @@ def books_table():
def list_books():
off = request.args.get("offset") or 0
limit = request.args.get("limit") or config.config_books_per_page
- sort = request.args.get("sort")
- if request.args.get("order") == 'asc':
- order = [db.Books.timestamp.asc()]
- else:
+ # sort = request.args.get("sort")
+ if request.args.get("order") == 'desc':
order = [db.Books.timestamp.desc()]
+ else:
+ order = [db.Books.timestamp.asc()]
search = request.args.get("search")
total_count = calibre_db.session.query(db.Books).count()
if search:
@@ -1047,10 +1047,10 @@ def update_table_settings():
@login_required_if_no_ano
def author_list():
if current_user.check_visibility(constants.SIDEBAR_AUTHOR):
- if current_user.get_view_property('author', 'dir') == 'asc':
- order = db.Authors.sort.asc()
- else:
+ if current_user.get_view_property('author', 'dir') == 'desc':
order = db.Authors.sort.desc()
+ else:
+ order = db.Authors.sort.asc()
entries = calibre_db.session.query(db.Authors, func.count('books_authors_link.book').label('count')) \
.join(db.books_authors_link).join(db.Books).filter(calibre_db.common_filters()) \
.group_by(text('books_authors_link.author')).order_by(order).all()
@@ -1068,10 +1068,10 @@ def author_list():
@web.route("/publisher")
@login_required_if_no_ano
def publisher_list():
- if current_user.get_view_property('publisher', 'dir') == 'asc':
- order = db.Publishers.name.asc()
- else:
+ if current_user.get_view_property('publisher', 'dir') == 'desc':
order = db.Publishers.name.desc()
+ else:
+ order = db.Publishers.name.asc()
if current_user.check_visibility(constants.SIDEBAR_PUBLISHER):
entries = calibre_db.session.query(db.Publishers, func.count('books_publishers_link.book').label('count')) \
.join(db.books_publishers_link).join(db.Books).filter(calibre_db.common_filters()) \
@@ -1089,10 +1089,10 @@ def publisher_list():
@login_required_if_no_ano
def series_list():
if current_user.check_visibility(constants.SIDEBAR_SERIES):
- if current_user.get_view_property('series', 'dir') == 'asc':
- order = db.Series.sort.asc()
- else:
+ if current_user.get_view_property('series', 'dir') == 'desc':
order = db.Series.sort.desc()
+ else:
+ order = db.Series.sort.asc()
if current_user.get_view_property('series', 'series_view') == 'list':
entries = calibre_db.session.query(db.Series, func.count('books_series_link.book').label('count')) \
.join(db.books_series_link).join(db.Books).filter(calibre_db.common_filters()) \
@@ -1120,10 +1120,10 @@ def series_list():
@login_required_if_no_ano
def ratings_list():
if current_user.check_visibility(constants.SIDEBAR_RATING):
- if current_user.get_view_property('ratings', 'dir') == 'asc':
- order = db.Ratings.rating.asc()
- else:
+ if current_user.get_view_property('ratings', 'dir') == 'desc':
order = db.Ratings.rating.desc()
+ else:
+ order = db.Ratings.rating.asc()
entries = calibre_db.session.query(db.Ratings, func.count('books_ratings_link.book').label('count'),
(db.Ratings.rating / 2).label('name')) \
.join(db.books_ratings_link).join(db.Books).filter(calibre_db.common_filters()) \
@@ -1138,10 +1138,10 @@ def ratings_list():
@login_required_if_no_ano
def formats_list():
if current_user.check_visibility(constants.SIDEBAR_FORMAT):
- if current_user.get_view_property('ratings', 'dir') == 'asc':
- order = db.Data.format.asc()
- else:
+ if current_user.get_view_property('ratings', 'dir') == 'desc':
order = db.Data.format.desc()
+ else:
+ order = db.Data.format.asc()
entries = calibre_db.session.query(db.Data,
func.count('data.book').label('count'),
db.Data.format.label('format')) \
@@ -1186,10 +1186,10 @@ def language_overview():
@login_required_if_no_ano
def category_list():
if current_user.check_visibility(constants.SIDEBAR_CATEGORY):
- if current_user.get_view_property('category', 'dir') == 'asc':
- order = db.Tags.name.asc()
- else:
+ if current_user.get_view_property('category', 'dir') == 'desc':
order = db.Tags.name.desc()
+ else:
+ order = db.Tags.name.asc()
entries = calibre_db.session.query(db.Tags, func.count('books_tags_link.book').label('count')) \
.join(db.books_tags_link).join(db.Books).order_by(order).filter(calibre_db.common_filters()) \
.group_by(text('books_tags_link.tag')).all()
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 0bb41cd6..cfa64b47 100644
--- a/test/Calibre-Web TestSummary_Linux.html
+++ b/test/Calibre-Web TestSummary_Linux.html
@@ -37,20 +37,20 @@
-
Start Time: 2020-09-12 12:12:43
+
Start Time: 2020-09-27 18:28:36
-
Stop Time: 2020-09-12 13:55:09
+
Stop Time: 2020-09-27 20:12:24
-
Duration: 1h 25 min
+
Duration: 1h 26 min
@@ -511,15 +511,15 @@ AssertionError: False is not true
-
+
TestEditAdditionalBooks |
- 10 |
+ 11 |
10 |
0 |
0 |
- 0 |
+ 1 |
- Detail
+ Detail
|
@@ -581,7 +581,7 @@ AssertionError: False is not true
- TestEditAdditionalBooks - test_upload_metadata_cbt
+ TestEditAdditionalBooks - test_upload_edit_role
|
PASS |
@@ -590,7 +590,7 @@ AssertionError: False is not true
- TestEditAdditionalBooks - test_upload_metadate_cbr
+ TestEditAdditionalBooks - test_upload_metadata_cbr
|
PASS |
@@ -599,14 +599,40 @@ AssertionError: False is not true
- TestEditAdditionalBooks - test_writeonly_database
+ TestEditAdditionalBooks - test_upload_metadata_cbt
|
PASS |
-
+
+
+ TestEditAdditionalBooks - test_writeonly_calibre_database
+ |
+
+
+
+
+
+
+
+ |
+
+
+
+
+
TestEditAdditionalBooks - test_writeonly_path
|
@@ -619,8 +645,8 @@ AssertionError: False is not true
TestEditBooks |
33 |
- 30 |
- 1 |
+ 25 |
+ 6 |
0 |
2 |
@@ -630,11 +656,31 @@ AssertionError: False is not true
- |
+
TestEditBooks - test_download_book
|
- PASS |
+
+
+
+
+
+
+
+ |
@@ -648,11 +694,33 @@ AssertionError: False is not true
-
+
TestEditBooks - test_edit_category
|
- PASS |
+
+
+
+
+
+
+
+ |
@@ -738,11 +806,34 @@ AssertionError: False is not true
-
+
TestEditBooks - test_edit_publisher
|
- PASS |
+
+
+
+
+
+
+
+ |
@@ -782,11 +873,33 @@ AssertionError: False is not true
-
+
TestEditBooks - test_edit_series
|
- PASS |
+
+
+
+
+
+
+
+ |
@@ -853,11 +966,34 @@ AssertionError: False is not true
-
+
TestEditBooks - test_typeahead_publisher
|
- PASS |
+
+
+
+
+
+
+
+ |
@@ -969,7 +1105,7 @@ AssertionError: False is not true
Traceback (most recent call last):
- File "/home/matthias/Entwicklung/calibre-web-test/test/test_edit_books.py", line 735, in test_upload_cover_hdd
+ File "/home/matthias/Entwicklung/calibre-web-test/test/test_edit_books.py", line 737, in test_upload_cover_hdd
self.assertTrue(False, "Browser-Cache Problem: Old Cover is displayed instead of New Cover")
AssertionError: False is not true : Browser-Cache Problem: Old Cover is displayed instead of New Cover
@@ -985,8 +1121,8 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
TestEditBooksOnGdrive |
19 |
- 18 |
- 1 |
+ 14 |
+ 5 |
0 |
0 |
@@ -996,11 +1132,31 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
- |
+
TestEditBooksOnGdrive - test_download_book
|
- PASS |
+
+
+
+
+
+
+
+ |
@@ -1014,11 +1170,33 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
+
TestEditBooksOnGdrive - test_edit_category
|
- PASS |
+
+
+
+
+
+
+
+ |
@@ -1104,11 +1282,34 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
+
TestEditBooksOnGdrive - test_edit_publisher
|
- PASS |
+
+
+
+
+
+
+
+ |
@@ -1122,11 +1323,33 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
+
TestEditBooksOnGdrive - test_edit_series
|
- PASS |
+
+
+
+
+
+
+
+ |
@@ -1175,7 +1398,7 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
Traceback (most recent call last):
- File "/home/matthias/Entwicklung/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 717, in test_upload_cover_hdd
+ File "/home/matthias/Entwicklung/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 719, in test_upload_cover_hdd
self.assertTrue(False, "Browser-Cache Problem: Old Cover is displayed instead of New Cover")
AssertionError: False is not true : Browser-Cache Problem: Old Cover is displayed instead of New Cover
@@ -1602,12 +1825,12 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
+
TestLdapLogin |
10 |
- 10 |
- 0 |
+ 9 |
0 |
+ 1 |
0 |
Detail
@@ -1697,11 +1920,43 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
- |
+
TestLdapLogin - test_ldap_opds_download_book
|
- PASS |
+
+
+
+
+
+
+
+ |
@@ -1958,11 +2213,11 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
+
TestOPDSFeed |
20 |
- 20 |
- 0 |
+ 19 |
+ 1 |
0 |
0 |
@@ -2098,11 +2353,31 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
- |
+
TestOPDSFeed - test_opds_search
|
- PASS |
+
+
+
+
+
+
+
+ |
@@ -2153,15 +2428,15 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
- TestRegister |
- 7 |
- 7 |
- 0 |
+
+ TestReader |
+ 5 |
+ 4 |
+ 1 |
0 |
0 |
- Detail
+ Detail
|
@@ -2169,7 +2444,7 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
- TestRegister - test_forgot_password
+ TestReader - test_comic_reader
|
PASS |
@@ -2178,7 +2453,7 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
- TestRegister - test_limit_domain
+ TestReader - test_epub_reader
|
PASS |
@@ -2187,7 +2462,7 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
- TestRegister - test_register_no_server
+ TestReader - test_pdf_reader
|
PASS |
@@ -2196,34 +2471,114 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
- TestRegister - test_registering_only_email
+ TestReader - test_sound_listener
|
PASS |
-
+
- TestRegister - test_registering_user
+ TestReader - test_txt_reader
|
- PASS |
-
-
-
-
-
-
- TestRegister - test_registering_user_fail
+ |
+
+
+
+
+
+
|
- PASS |
-
-
-
- TestRegister - test_user_change_password
+
+
+ |
+ TestRegister |
+ 7 |
+ 7 |
+ 0 |
+ 0 |
+ 0 |
+
+ Detail
+ |
+
+
+
+
+
+
+ TestRegister - test_forgot_password
+ |
+ PASS |
+
+
+
+
+
+
+ TestRegister - test_limit_domain
+ |
+ PASS |
+
+
+
+
+
+
+ TestRegister - test_register_no_server
+ |
+ PASS |
+
+
+
+
+
+
+ TestRegister - test_registering_only_email
+ |
+ PASS |
+
+
+
+
+
+
+ TestRegister - test_registering_user
+ |
+ PASS |
+
+
+
+
+
+
+ TestRegister - test_registering_user_fail
+ |
+ PASS |
+
+
+
+
+
+
+ TestRegister - test_user_change_password
|
PASS |
@@ -2239,13 +2594,13 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
0 |
1 |
- Detail
+ Detail
|
-
+
TestShelf - test_add_shelf_from_search
|
@@ -2254,7 +2609,7 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
+
TestShelf - test_arrange_shelf
|
@@ -2263,7 +2618,7 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
+
TestShelf - test_delete_book_of_shelf
|
@@ -2272,7 +2627,7 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
+
TestShelf - test_private_shelf
|
@@ -2281,7 +2636,7 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
+
TestShelf - test_public_private_shelf
|
@@ -2290,7 +2645,7 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
+
TestShelf - test_public_shelf
|
@@ -2299,7 +2654,7 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
+
TestShelf - test_rename_shelf
|
@@ -2308,7 +2663,7 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
+
TestShelf - test_shelf_action_non_shelf_edit_role
|
@@ -2317,7 +2672,7 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
+
TestShelf - test_shelf_anonymous
|
@@ -2326,19 +2681,19 @@ AssertionError: False is not true : Browser-Cache Problem: Old Cover is displaye
-
+
TestShelf - test_shelf_database_change
|
-
+
- |