Changeset 5915

Timestamp:

6 Apr 2011, 06:44:36 (14 years ago)

Author:

Henrik Bettermann

Message:

Use only getName method from helpers.py. Don't define getName for each container class.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• tables.py (modified) (2 diffs)
• university/faculty.py (modified) (1 diff)
• university/facultycontainer.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/tables.py

@@ -6 +6 @@
 from waeup.sirp.widgets.table import YUITable as Table
 from waeup.sirp.widgets.table import Col
+from waeup.sirp.utils.helpers import getName
 
 class CodeAndTitleTableProvider(grok.Adapter):
@@ -41 +42 @@
             Col(
                 header='Title', sortable=True,
-                data = tuple([data.getName(x) for x in data])),
+                data = tuple([getName(data[x]) for x in data])),
             )
         self.table = Table(self.title, cols=cols)

main/waeup.sirp/trunk/src/waeup/sirp/university/faculty.py

@@ -35 +35 @@
             del self[key]
 
-    def getName(self, key):
-        """Get complete faculty name.
-        """
-        if key in self.keys():
-            dept = self[key]
-            prefix = dept.title_prefix
-            prefix = prefix[0].upper() + prefix[1:]
-            return '%s of %s' % (prefix, dept.title)
+    #def getName(self, key):
+    #    """Get complete department name.
+    #    """
+    #    if key in self.keys():
+    #        dept = self[key]
+    #        prefix = dept.title_prefix
+    #        prefix = prefix[0].upper() + prefix[1:]
+    #        return '%s of %s' % (prefix, dept.title)
 
         

main/waeup.sirp/trunk/src/waeup/sirp/university/facultycontainer.py

@@ -22 +22 @@
             del self[key]
 
-    def getName(self, key):
-        if key in self.keys():
-            fac = self[key]
-            prefix = fac.title_prefix
-            prefix = prefix[0].upper() + prefix[1:]
-            return '%s of %s' % (prefix, fac.title)
+    #def getName(self, key):
+    #    if key in self.keys():
+    #        fac = self[key]
+    #        prefix = fac.title_prefix
+    #        prefix = prefix[0].upper() + prefix[1:]
+    #        return '%s of %s' % (prefix, fac.title)
             
 class FacultyContainerFactory(grok.GlobalUtility):