Fix(web/views/list_books): Fix a bug in series naming

[m_librarian.git] / m_librarian / web / views / list_books.py

diff --git a/m_librarian/web/views/list_books.py b/m_librarian/web/views/list_books.py
index 0eadec04e75f6abdbf306de096579bfd3e169447..210516b61f92fc77175be0f824b6598ae6013965 100644 (file)
--- a/m_librarian/web/views/list_books.py
+++ b/m_librarian/web/views/list_books.py
@@ -35,12 +35,12 @@ VFFSL=valueFromFrameOrSearchList
 VFSL=valueFromSearchList
 VFN=valueForName
 currentTime=time.time
-__CHEETAH_version__ = '3.1.0'
-__CHEETAH_versionTuple__ = (3, 1, 0, 'final', 1)
-__CHEETAH_genTime__ = 1528717961.535029
-__CHEETAH_genTimestamp__ = 'Mon Jun 11 14:52:41 2018'
+__CHEETAH_version__ = '3.2.6'
+__CHEETAH_versionTuple__ = (3, 2, 6, 'final', 0)
+__CHEETAH_genTime__ = 1671291302.390272
+__CHEETAH_genTimestamp__ = 'Sat Dec 17 18:35:02 2022'
 __CHEETAH_src__ = 'list_books.tmpl'
-__CHEETAH_srcLastModified__ = 'Mon Jun 11 14:52:39 2018'
+__CHEETAH_srcLastModified__ = 'Sat Dec 17 18:34:51 2022'
 __CHEETAH_docstring__ = 'Autogenerated by Cheetah: The Python-Powered Template Engine'
 
 if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple:
@@ -113,9 +113,9 @@ class list_books(layout):
 ''')
             write(u'''  </tr>
 ''')
-            series = None
             columns1 = VFFSL(SL,"len",False)(VFFSL(SL,"columns",True))+1
-            for author in VFFSL(SL,"sorted",False)(VFFSL(SL,"books_by_author",True)): # generated from line 21, col 3
+            for author in VFFSL(SL,"sorted",False)(VFFSL(SL,"books_by_author",True)): # generated from line 20, col 3
+                series = None
                 books = VFFSL(SL,"books_by_author",True)[VFFSL(SL,"author",True)]
                 for book in VFFSL(SL,"books",True): # generated from line 23, col 5
                     if VFFSL(SL,"book.series",True) != VFFSL(SL,"series",True): # generated from line 24, col 5
@@ -145,23 +145,30 @@ class list_books(layout):
                     write(u'''"></td>
 ''')
                     for column in VFFSL(SL,"columns",True): # generated from line 39, col 3
-                        write(u'''  <td>''')
-                        _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 40, col 7
-                        if _v is not None: write(_filter(_v, rawExpr=u"$cgi.escape(unicode($getattr($book, $column) or ''))")) # from line 40, col 7.
+                        if VFFSL(SL,"column",True) in ('ser_no', 'size'): # generated from line 40, col 3
+                            style = ' style="text-align: right; width: 5ex"'
+                        else: # generated from line 42, col 3
+                            style = ''
+                        write(u'''  <td''')
+                        _v = VFFSL(SL,"style",True) # u'$style' on line 45, col 6
+                        if _v is not None: write(_filter(_v, rawExpr=u'$style')) # from line 45, col 6.
+                        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 45, col 13
+                        if _v is not None: write(_filter(_v, rawExpr=u"$cgi.escape(unicode($getattr($book, $column) or ''))")) # from line 45, col 13.
                         write(u'''</td>
 ''')
                     write(u'''  </tr>
 ''')
             write(u'''  <tr>
   <td colspan="''')
-            _v = VFFSL(SL,"columns1",True) # u'$columns1' on line 46, col 16
-            if _v is not None: write(_filter(_v, rawExpr=u'$columns1')) # from line 46, col 16.
+            _v = VFFSL(SL,"columns1",True) # u'$columns1' on line 51, col 16
+            if _v is not None: write(_filter(_v, rawExpr=u'$columns1')) # from line 51, col 16.
             write(u'''" style="text-align: center"><input type="submit" value="\u0421\u043a\u0430\u0447\u0430\u0442\u044c"></td>
   </tr>
   </table>
   </form>
 ''')
-        else: # generated from line 50, col 1
+        else: # generated from line 55, col 1
             write(u'''  <p>\u041d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e \u043d\u0438 \u043e\u0434\u043d\u043e\u0439 \u043a\u043d\u0438\u0433\u0438!</p>
 ''')
         
@@ -229,7 +236,7 @@ if not hasattr(list_books, '_initCheetahAttributes'):
 
 # CHEETAH was developed by Tavis Rudd and Mike Orr
 # with code, advice and input from many other volunteers.
-# For more information visit http://cheetahtemplate.org/
+# For more information visit https://cheetahtemplate.org/
 
 ##################################################
 ## if run from command line: