From 148f1109c651dd19305573db63574ded4b3f1c71 Mon Sep 17 00:00:00 2001 From: ElQuimm <50202052+ElQuimm@users.noreply.github.com> Date: Mon, 4 May 2020 20:56:58 +0200 Subject: [PATCH 1/2] updated messages.po just a little update for coherence with Read/da leggere -> Archived/da archiviare. Sorry :-) --- cps/translations/it/LC_MESSAGES/messages.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po index cdb92ec5..48ceef81 100644 --- a/cps/translations/it/LC_MESSAGES/messages.po +++ b/cps/translations/it/LC_MESSAGES/messages.po @@ -1920,7 +1920,7 @@ msgstr "Aggiungi all'archivio" #: cps/templates/detail.html:209 msgid "Archived" -msgstr "Archiviato" +msgstr "da archiviare" #: cps/templates/detail.html:219 msgid "Description:" From 69fde7deadd22f1d69b7794a4ecdfcc2d446017d Mon Sep 17 00:00:00 2001 From: Knepherbird Date: Thu, 7 May 2020 13:55:59 -0700 Subject: [PATCH 2/2] Update web.py Set db.Publishers query to order by name column, because publishers.sort column is empty. --- cps/web.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/web.py b/cps/web.py index 2b87099c..d2e18aaa 100644 --- a/cps/web.py +++ b/cps/web.py @@ -801,7 +801,7 @@ def publisher_list(): if current_user.check_visibility(constants.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(text('books_publishers_link.publisher')).order_by(db.Publishers.sort).all() + .group_by(text('books_publishers_link.publisher')).order_by(db.Publishers.name).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()