Changeset 9845 for main/waeup.kofa/trunk


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

    r9839 r9845  
    206206        exporter = getUtility(ICSVExporter, name=exporter_name)
    207207        exporter_title = getattr(exporter, 'title', 'Unknown')
    208         args = ', '.join([str(x) for x in job.kwargs.values()])
     208        args = ', '.join(['%s=%s' % (item[0], item[1])
     209            for item in job.kwargs.items()])
    209210        status = job.finished and 'ready' or 'running'
    210211        status = job.failed and 'FAILED' or status
  • main/waeup.kofa/trunk/src/waeup/kofa/catalog.py

    r9843 r9845  
    122122        query = dict()
    123123        for idx_name, value in self._kw.items():
    124             if idx_name == 'cat':
     124            if idx_name == 'catalog':
    125125                continue
    126126            if not isinstance(value, tuple):
  • main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

    r9844 r9845  
    28342834                                      # pass different keywords than
    28352835                                      # for the (default) students_catalog
    2836                                       cat='coursetickets',
     2836                                      catalog='coursetickets',
    28372837                                      session=session,
    28382838                                      level=level,
  • main/waeup.kofa/trunk/src/waeup/kofa/students/export.py

    r9844 r9845  
    123123        # developers must look into catalog to see what keywords are
    124124        # valid.
    125         if kw.get('cat', None) == 'coursetickets':
     125        if kw.get('catalog', None) == 'coursetickets':
    126126            coursetickets = CourseTicketsQuery(**kw).query()
    127127            students = []
  • main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py

    r9844 r9845  
    573573        # only course tickets which belong to this course are exported
    574574        exporter.export_filtered(
    575             self.student, self.outfile, cat='coursetickets', code='CRS1')
     575            self.student, self.outfile, catalog='coursetickets', code='CRS1')
    576576        result = open(self.outfile, 'rb').read()
    577577        self.assertEqual(
     
    582582            )
    583583        exporter.export_filtered(
    584             self.student, self.outfile, cat='coursetickets', code='any code')
     584            self.student, self.outfile, catalog='coursetickets', code='any code')
    585585        result = open(self.outfile, 'rb').read()
    586586        self.assertEqual(
Note: See TracChangeset for help on using the changeset viewer.