Changeset 15234 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

13 Nov 2018, 06:54:19 (6 years ago)

Author:

Henrik Bettermann

Message:

Titles with redundant whitespaces could cause an infinite loop. Remove this bug and use the textwrapper functions instead.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• tests/test_browser.py (modified) (1 diff)
• utils.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -4394 +4394 @@
     def test_lecturers_can_download_course_tickets(self):
         # A course ticket slip can be downloaded
-        self.course.title = (u'Lorem ipsum dolor sit amet, consectetur adipisici, '
-                             u'sed eiusmod tempor incidunt ut labore et dolore ')
+        self.course.title = (u'Lorem ipsum     dolor sit amet, consectetur     adipisici, '
+                             u'sed         eiusmod tempor    incidunt ut  labore et dolore')
         self.login_as_lecturer()
         pdf_url = '%s/coursetickets.pdf' % self.course_url

main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py

@@ -19 +19 @@
 """
 import grok
+import textwrap
 from time import time
 from cStringIO import StringIO
@@ -1008 +1009 @@
         style = getSampleStyleSheet()
         pdf_data = []
-        ct = ft = view.context.title
-        # Process title if too long
-        if len(view.context.title) + len(view.context.code) > title_length:
-            i = 0
-            titlelist = view.context.title.split()
-            while len(' '.join(titlelist[:i+1])) < title_length:
-                i += 1
-            ct = ' '.join(titlelist[:i]) + '\n' + ' '.join(titlelist[i:])
-            ft = view.context.title[
-                :(title_length-len(view.context.code))] + u' ...'
         pdf_data += [Paragraph(
             translate(_('<b>Lecturer(s): ${a}</b>',
@@ -1044 +1035 @@
         pdf_data.append(Spacer(1, 20))
         pdf_data += [Table(data[0], style=CONTENT_STYLE)]
+        # Process title if too long
+        title = " ".join(view.context.title.split())
+        ct = textwrap.fill(title, title_length)
+        ft = title
+        if len(ct) > 1:
+            ft = textwrap.wrap(title, title_length)[0] + ' ...'
         doc_title = translate(_('${a} (${b})\nAcademic Session ${d}',
             mapping = {'a':ct,