Changeset 4434 for waeup/branches/ulif-rewrite/src

Timestamp:

25 Jul 2009, 11:31:00 (15 years ago)

Author:

uli

Message:

Move faculty table provider for universities to new module.

Location:

waeup/branches/ulif-rewrite/src/waeup

Files:

• app.py (modified) (3 diffs)
• tables.py (modified) (4 diffs)

waeup/branches/ulif-rewrite/src/waeup/app.py

@@ -13 +13 @@
 from waeup.users import UserContainer
 from waeup.widgets.interfaces import ITableProvider
-from waeup.widgets.table import Table, Col, YUITable
 
 class University(grok.Application, grok.Container):
@@ -95 +94 @@
                                  # be rendered in this viewlet.
 
-class FacultyTableProvider(grok.Adapter):
-    grok.context(IUniversity)
-    grok.provides(ITableProvider)
-
-    def __init__(self, context):
-        self.context = context
-        data = self.context.faculties
-        cols = (
-            Col(
-                header='Code', sortable=True,
-                data = tuple(['<a href="faculties/%s">%s</a>' % (
-                            data[x].code, data[x].code) for x in data])),
-            Col(
-                header='Prefix', sortable=True,
-                data = tuple([data[x].title_prefix for x in data])),
-            Col(
-                header='Title', sortable=True,
-                data = tuple([data[x].title for x in data])),
-                )
-        self.table = YUITable('Faculties', cols=cols)
-
-    def getTable(self):
-        return self.table
-    
 class Content(grok.Viewlet):
     grok.viewletmanager(MainArea)
@@ -125 +100 @@
 
     def update(self):
-        self.table = ITableProvider(self.context).getTable()
+        self.table = ITableProvider(self.context).getTable(self.view)
         self.table.need()
 

waeup/branches/ulif-rewrite/src/waeup/tables.py

@@ -9 +9 @@
 
 class CodeAndTitleTableProvider(grok.Adapter):
+    """A table provider for objects that have a code, title and prefix.
+    """
     grok.baseclass()
     grok.provides(ITableProvider)
@@ -14 +16 @@
     title = None
 
+    def __init__(self, context):
+        self.context = context
+        self.prepare()
+
+    def prepare(self):
+        self.data_source = self.context
+
+    def getItemURL(self, view, value):
+        context_url = ''
+        if not view is None:
+            context_url = view.url(self.data_source) + '/'
+        result = '<a href="%s%s">%s</a>' % (context_url, value, value)
+        return result
+    
     def getTable(self, view=None):
-        data = self.context
+        data = self.data_source
         context_url = ''
         if view:
@@ -22 +38 @@
             Col(
                 header='Code', sortable=True,
-                data = tuple(['<a href="%s%s">%s</a>' % (
-                            context_url, data[x].code,
-                            data[x].code) for x in data])),
+                data = tuple([self.getItemURL(view, data[x].code)
+                              for x in data])),
             Col(
                 header='Title', sortable=True,
@@ -41 +56 @@
     grok.provides(ITableProvider)
     title = 'Faculties'
+
+class UniversityTableProvider(CodeAndTitleTableProvider):
+    grok.context(IUniversity)
+    grok.provides(ITableProvider)
+    title = 'Faculties'
+
+    def prepare(self):
+        self.data_source = self.context.faculties