Changeset 9845

Timestamp:

8 Jan 2013, 14:24:05 (12 years ago)

Author:

Henrik Bettermann

Message:

Rename cat keyword and show keyword in filter column.

Location:

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

Files:

• browser/pages.py (modified) (1 diff)
• catalog.py (modified) (1 diff)
• students/browser.py (modified) (1 diff)
• students/export.py (modified) (1 diff)
• students/tests/test_export.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -206 +206 @@
         exporter = getUtility(ICSVExporter, name=exporter_name)
         exporter_title = getattr(exporter, 'title', 'Unknown')
-        args = ', '.join([str(x) for x in job.kwargs.values()])
+        args = ', '.join(['%s=%s' % (item[0], item[1])
+            for item in job.kwargs.items()])
         status = job.finished and 'ready' or 'running'
         status = job.failed and 'FAILED' or status

main/waeup.kofa/trunk/src/waeup/kofa/catalog.py

@@ -122 +122 @@
         query = dict()
         for idx_name, value in self._kw.items():
-            if idx_name == 'cat':
+            if idx_name == 'catalog':
                 continue
             if not isinstance(value, tuple):

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

@@ -2834 +2834 @@
                                       # pass different keywords than
                                       # for the (default) students_catalog
-                                      cat='coursetickets',
+                                      catalog='coursetickets',
                                       session=session,
                                       level=level,

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

@@ -123 +123 @@
         # developers must look into catalog to see what keywords are
         # valid.
-        if kw.get('cat', None) == 'coursetickets':
+        if kw.get('catalog', None) == 'coursetickets':
             coursetickets = CourseTicketsQuery(**kw).query()
             students = []

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

@@ -573 +573 @@
         # only course tickets which belong to this course are exported
         exporter.export_filtered(
-            self.student, self.outfile, cat='coursetickets', code='CRS1')
+            self.student, self.outfile, catalog='coursetickets', code='CRS1')
         result = open(self.outfile, 'rb').read()
         self.assertEqual(
@@ -582 +582 @@
             )
         exporter.export_filtered(
-            self.student, self.outfile, cat='coursetickets', code='any code')
+            self.student, self.outfile, catalog='coursetickets', code='any code')
         result = open(self.outfile, 'rb').read()
         self.assertEqual(