Changeset 9817

Timestamp:

21 Dec 2012, 13:20:38 (12 years ago)

Author:

Henrik Bettermann

Message:

Adjust job description.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py (modified) (2 diffs)

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

@@ -2668 +2668 @@
         for job_id, exporter_name, user_id in job_entries:
             job = job_manager.get(job_id)
-
-            # XXX: Descr. should be improved
-            descr = '%r, %r' % (job.args[1:], job.kwargs)
+            exporter = getUtility(ICSVExporter, name=exporter_name)
+            exporter_title = getattr(exporter, 'title', 'Unknown')
+            args = ', '.join([str(x) for x in job.kwargs.values()])
+            descr = '%s (%s)' % (exporter_title, args)
             status = job.finished and 'ready' or 'running'
             status = job.failed and 'FAILED' or status
-            show_download_button = job.finished and not job.failed
-            show_discard_button = job.finished
-            show_refresh_button = not job.finished
             start_time = getattr(job, 'begin_after', None)
             if start_time:
@@ -2690 +2688 @@
                 start_time=start_time,
                 download_url=download_url,
-                show_download_button = show_download_button,
-                show_refresh_button = show_refresh_button,
-                show_discard_button = show_discard_button,)
+                show_download_button = (job.finished and not job.failed),
+                show_refresh_button = not job.finished,
+                show_discard_button = job.finished,)
             entries.append(new_entry)
         self.entries = entries