From 5b3f3a1eb1b0f432e952e26f2c7a721e58ddb2e0 Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sat, 17 Dec 2022 18:46:28 +0300 Subject: [PATCH] Feat(web/views/list_books): Toggle checkboxes for series [skip ci] --- docs-ru/news.rst | 2 + docs/news.rst | 2 + m_librarian/web/views/list_books.py | 88 ++++++++++++++++----------- m_librarian/web/views/list_books.tmpl | 16 ++++- 4 files changed, 73 insertions(+), 35 deletions(-) diff --git a/docs-ru/news.rst b/docs-ru/news.rst index 4d13ee7..c02fdc5 100644 --- a/docs-ru/news.rst +++ b/docs-ru/news.rst @@ -4,6 +4,8 @@ Версия 0.1.7 (в разработке) --------------------------- +* Переключать чекбоксы для книг по сериям. + * Python 3.11. Версия 0.1.6 (2021-09-24) diff --git a/docs/news.rst b/docs/news.rst index 93f3a30..254af81 100644 --- a/docs/news.rst +++ b/docs/news.rst @@ -4,6 +4,8 @@ News Version 0.1.7 (in development) ------------------------------ +* Toggle checkboxes for books in series. + * Python 3.11. Version 0.1.6 (2021-09-24) diff --git a/m_librarian/web/views/list_books.py b/m_librarian/web/views/list_books.py index 90e7443..418a553 100644 --- a/m_librarian/web/views/list_books.py +++ b/m_librarian/web/views/list_books.py @@ -37,10 +37,10 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '3.2.6' __CHEETAH_versionTuple__ = (3, 2, 6, 'final', 0) -__CHEETAH_genTime__ = 1671291191.270126 -__CHEETAH_genTimestamp__ = 'Sat Dec 17 18:33:11 2022' +__CHEETAH_genTime__ = 1671296508.007271 +__CHEETAH_genTimestamp__ = 'Sat Dec 17 20:01:48 2022' __CHEETAH_src__ = 'list_books.tmpl' -__CHEETAH_srcLastModified__ = 'Sat Dec 17 18:33:09 2022' +__CHEETAH_srcLastModified__ = 'Sat Dec 17 20:01:44 2022' __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine' if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple: @@ -93,8 +93,20 @@ class list_books(layout): if _v is not None: write(_filter(_v, rawExpr=u'$title')) # from line 7, col 5. write(u''' + + ''') - if VFFSL(SL,"books_by_author",True): # generated from line 9, col 1 + if VFFSL(SL,"books_by_author",True): # generated from line 21, col 1 write(u'''
@@ -103,80 +115,88 @@ class list_books(layout): if False: _ _ = VFFSL(SL,"getattr",False)(VFFSL(SL,"translations",True), 'ugettext', None) or VFFSL(SL,"translations.gettext",True) - for column in VFFSL(SL,"columns",True): # generated from line 15, col 3 + for column in VFFSL(SL,"columns",True): # generated from line 27, col 3 write(u''' ''') write(u''' ''') columns1 = VFFSL(SL,"len",False)(VFFSL(SL,"columns",True))+1 - for anum, author in VFFSL(SL,"enumerate",False)(VFFSL(SL,"sorted",False)(VFFSL(SL,"books_by_author",True))): # generated from line 20, col 3 + for anum, author in VFFSL(SL,"enumerate",False)(VFFSL(SL,"sorted",False)(VFFSL(SL,"books_by_author",True))): # generated from line 32, col 3 series = None snum = 0 books = VFFSL(SL,"books_by_author",True)[VFFSL(SL,"author",True)] - for book in VFFSL(SL,"books",True): # generated from line 24, col 5 - if VFFSL(SL,"book.series",True) != VFFSL(SL,"series",True): # generated from line 25, col 5 + for book in VFFSL(SL,"books",True): # generated from line 36, col 5 + if VFFSL(SL,"book.series",True) != VFFSL(SL,"series",True): # generated from line 37, col 5 series = VFFSL(SL,"book.series",True) snum += 1 write(u''' + ''') write(u''' ''') - for column in VFFSL(SL,"columns",True): # generated from line 41, col 3 - if VFFSL(SL,"column",True) in ('ser_no', 'size'): # generated from line 42, col 3 + for column in VFFSL(SL,"columns",True): # generated from line 55, col 3 + if VFFSL(SL,"column",True) in ('ser_no', 'size'): # generated from line 56, col 3 style = ' style="text-align: right; width: 5ex"' - else: # generated from line 44, col 3 + else: # generated from line 58, col 3 style = '' write(u''' ''') - _v = VFN(VFFSL(SL,"cgi",True),"escape",False)(unicode(VFFSL(SL,"getattr",False)(VFFSL(SL,"book",True), VFFSL(SL,"column",True)) or '')) # u"$cgi.escape(unicode($getattr($book, $column) or ''))" on line 47, col 13 - if _v is not None: write(_filter(_v, rawExpr=u"$cgi.escape(unicode($getattr($book, $column) or ''))")) # from line 47, col 13. + _v = VFN(VFFSL(SL,"cgi",True),"escape",False)(unicode(VFFSL(SL,"getattr",False)(VFFSL(SL,"book",True), VFFSL(SL,"column",True)) or '')) # u"$cgi.escape(unicode($getattr($book, $column) or ''))" on line 61, col 13 + if _v is not None: write(_filter(_v, rawExpr=u"$cgi.escape(unicode($getattr($book, $column) or ''))")) # from line 61, col 13. write(u''' ''') write(u''' ''') write(u'''
''') if False: _(VFFSL(SL,"column",True)) - _v = VFN(VFFSL(SL,"cgi",True),"escape",False)(VFFSL(SL,"_",False)(VFFSL(SL,"column",True))) # u'$cgi.escape($_($column))' on line 16, col 36 - if _v is not None: write(_filter(_v, rawExpr=u'$cgi.escape($_($column))')) # from line 16, col 36. + _v = VFN(VFFSL(SL,"cgi",True),"escape",False)(VFFSL(SL,"_",False)(VFFSL(SL,"column",True))) # u'$cgi.escape($_($column))' on line 28, col 36 + if _v is not None: write(_filter(_v, rawExpr=u'$cgi.escape($_($column))')) # from line 28, col 36. write(u'''
''') - _v = VFFSL(SL,"author",True) # u'$author' on line 30, col 3 - if _v is not None: write(_filter(_v, rawExpr=u'$author')) # from line 30, col 3. + _v = VFFSL(SL,"author",True) # u'$author' on line 44, col 3 + if _v is not None: write(_filter(_v, rawExpr=u'$author')) # from line 44, col 3. write(u''' \u2014 ''') - if VFFSL(SL,"book.series",True): # generated from line 31, col 3 - _v = VFN(VFFSL(SL,"cgi",True),"escape",False)(VFFSL(SL,"series",True), 1) # u'$cgi.escape($series, 1)' on line 32, col 1 - if _v is not None: write(_filter(_v, rawExpr=u'$cgi.escape($series, 1)')) # from line 32, col 1. - else: # generated from line 33, col 3 + if VFFSL(SL,"book.series",True): # generated from line 45, col 3 + _v = VFN(VFFSL(SL,"cgi",True),"escape",False)(VFFSL(SL,"series",True), 1) # u'$cgi.escape($series, 1)' on line 46, col 1 + if _v is not None: write(_filter(_v, rawExpr=u'$cgi.escape($series, 1)')) # from line 46, col 1. + else: # generated from line 47, col 3 write(u'''\u0412\u043d\u0435 \u0441\u0435\u0440\u0438\u0439''') write(u'''
''') - else: # generated from line 57, col 1 + else: # generated from line 71, col 1 write(u'''

\u041d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e \u043d\u0438 \u043e\u0434\u043d\u043e\u0439 \u043a\u043d\u0438\u0433\u0438!

''') diff --git a/m_librarian/web/views/list_books.tmpl b/m_librarian/web/views/list_books.tmpl index 0e2424d..7219321 100644 --- a/m_librarian/web/views/list_books.tmpl +++ b/m_librarian/web/views/list_books.tmpl @@ -6,6 +6,18 @@ #def body

$title

+ + #if $books_by_author
@@ -26,7 +38,9 @@ #set $series = $book.series #set $snum += 1 - +
+ $author — #if $book.series $cgi.escape($series, 1)#slurp -- 2.39.5