Changeset 357ac6 in indico

Timestamp:

05/25/10 18:56:31 (3 years ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 4c7d4152dff271ba5df5a8606605969cab454080

Children:

36827b

Parents:

ba8adf

git-author:

Leszek Syroka <leszek.marek.syroka@…> (05/19/10 11:50:08)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (05/25/10 18:56:31)

Message:

[FIX] Affilation in PDF timetable

• affilations are now displayed correctly
• fix#397

File:

• indico/MaKaC/PDFinterface/conference.py (modified) (5 diffs)

indico/MaKaC/PDFinterface/conference.py

@@ -1388 +1388 @@
                 if not self._ttPDFFormat.showSpeakerTitle():
                     spkName = self._getNameWithoutTitle(spk)
+                if self._showSpeakerAffiliation and spk.getAffiliation().strip() != "":
+                    spkName += " (" + spk.getAffiliation() + ")"
                 spkList.append(spkName)
             if len(spkList) > 0:
@@ -1411 +1413 @@
                 if not self._ttPDFFormat.showSpeakerTitle():
                     spkName = self._getNameWithoutTitle(spk)
+                if self._showSpeakerAffiliation and spk.getAffiliation().strip() != "":
+                    spkName += " (" + spk.getAffiliation() + ")"
                 p=Paragraph(escape(spkName),self._styles["table_body"])
                 spkList.append([p])
@@ -1477 +1481 @@
                 if not self._ttPDFFormat.showSpeakerTitle():
                     spkName = self._getNameWithoutTitle(spk)
+                if self._showSpeakerAffiliation and spk.getAffiliation().strip() != "":
+                    spkName += " (" + spk.getAffiliation() + ")"
                 spkList.append(spkName)
             if len(spkList) > 0:
@@ -1591 +1597 @@
                 conv=[]
                 for c in sessionSlot.getConvenerList():
-                    if self._showSpeakerAffiliation:
+                    if self._showSpeakerAffiliation and c.getAffiliation().strip() != "":
                         conv.append("%s (%s)"%(escape(c.getFullName()), escape(c.getAffiliation())))
                     else:
@@ -1737 +1743 @@
                 spks=[]
                 for c in contrib.getSpeakerList():
-                    if self._showSpeakerAffiliation:
+                    if self._showSpeakerAffiliation and c.getAffiliation().strip() != "":
                         spks.append("%s (%s)"%(escape(c.getFullName()), escape(c.getAffiliation())))
                     else: