Author: justi9 Date: 2008-12-18 16:58:24 -0500 (Thu, 18 Dec 2008) New Revision: 3028 Modified: mgmt/trunk/cumin/python/cumin/job.py mgmt/trunk/cumin/python/cumin/job.strings Log: Fix the pool part of the links to top jobs Modified: mgmt/trunk/cumin/python/cumin/job.py =================================================================== --- mgmt/trunk/cumin/python/cumin/job.py 2008-12-18 21:52:54 UTC (rev 3027) +++ mgmt/trunk/cumin/python/cumin/job.py 2008-12-18 21:58:24 UTC (rev 3028) @@ -217,10 +217,15 @@ return "Name" def render_content(self, session, data): + pool = Identifiable(data["pool"]) job = Identifiable(data["id"]) - href = self.page.main.pool.job.get_href(session, job) - return fmt_link(href, fmt_shorten(data["name"])) + branch = session.branch() + self.page.main.pool.object.set(session, pool) + self.page.main.pool.job.object.set(session, job) + self.page.main.pool.job.show(session) + return fmt_link(branch.marshal(), fmt_shorten(data["name"])) + class DurationColumn(TopTableColumn): def render_title(self, session, data): return "Duration" Modified: mgmt/trunk/cumin/python/cumin/job.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/job.strings 2008-12-18 21:52:54 UTC (rev 3027) +++ mgmt/trunk/cumin/python/cumin/job.strings 2008-12-18 21:58:24 UTC (rev 3028) @@ -48,8 +48,10 @@ select j.id, j.custom_id as name, - j.q_date + j.q_date, + s.pool from job as j +join scheduler s on s.id = j.scheduler_id where j.job_status = 2 and j.qmf_update_time > now() - interval '60 seconds' order by j.q_date asc