Changeset a829f8 in indico for indico/MaKaC/conference.py

Timestamp:

04/20/12 16:35:39 (14 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, b8c30da8ebdbdcbd675a873997cc3e95f567de49, 4287315ec967a3da168d83963c14001db8487d53

Children:

1d80ec

Parents:

386721

git-author:

Jose Benito <jose.benito.gonzalez@…> (04/20/12 16:04:33)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (04/20/12 16:35:39)

Message:

[IMP] Contrib and Abstract display in general

File:

• indico/MaKaC/conference.py (modified) (3 diffs)

indico/MaKaC/conference.py

@@ -3563 +3563 @@
         return [c for c in self.contributions.values() if not c.getSession()]
 
-    def getContributionListSortedById(self):
+    def getContributionListSortedById(self, includeWithdrawn=True):
         """Returns a list of the conference contribution objects, sorted by their id
         """
         contributions = self.contributions.values()
+        if not includeWithdrawn:
+            contributions = filter(lambda c: not isinstance(c.getCurrentStatus(), ContribStatusWithdrawn), contributions)
         contributions.sort(key = lambda c: c.getId())
         return contributions
@@ -7478 +7480 @@
 
     def getDirectFullNameNoTitle( self ):
-        res = self.getFamilyName().decode('utf-8').upper().encode('utf-8')
-        if self.getFirstName() != "":
-            if res.strip() != "":
-                res = "%s %s"%( self.getFirstName(), res )
-            else:
-                res = self.getFirstName()
-        return res
+        return ("%s %s"%(self.getFirstName(), self.getFamilyName().upper())).strip()
 
     def getFullName( self ):
@@ -10002 +9998 @@
 
     def getDirectFullNameNoTitle( self ):
-        res = self.getFamilyName().decode('utf-8').upper().encode('utf-8')
-        if self.getFirstName() != "":
-            if res.strip() != "":
-                res = "%s %s"%( self.getFirstName(), res )
-            else:
-                res = self.getFirstName()
-        return res
+        return ("%s %s"%(self.getFirstName(), self.getFamilyName().upper())).strip()
 
 class SubContribution(CommonObjectBase, Locatable):