Author: eallen Date: 2008-09-12 15:32:44 -0400 (Fri, 12 Sep 2008) New Revision: 2464 Modified: mgmt/trunk/cumin/python/cumin/job.py mgmt/trunk/cumin/python/cumin/job.strings Log: Adding Submitter column (without link to submitter for now) Modified: mgmt/trunk/cumin/python/cumin/job.py =================================================================== --- mgmt/trunk/cumin/python/cumin/job.py 2008-09-12 19:03:21 UTC (rev 2463) +++ mgmt/trunk/cumin/python/cumin/job.py 2008-09-12 19:32:44 UTC (rev 2464) @@ -36,12 +36,12 @@ col = self.AccountingGroupColumn(app, "agroup") self.add_hidden_column(col) - #col = self.SubmitterColumn(app, "submitter") - #self.add_hidden_column(col) - col = self.SchedulerColumn(app, "scheduler") self.add_hidden_column(col) + col = self.SubmitterColumn(app, "submitter") + self.add_hidden_column(col) + col = self.ClusterIdColumn(app, "cluster_id") col.alignment = "right" self.add_hidden_column(col) @@ -132,16 +132,10 @@ def render_title(self, session, data): return "Accounting Group" -# class SubmitterColumn(SqlTableColumn): -# def render_title(self, session, data): -# return "Submitter" -# -# def render_content(self, session, data): -# job = Identifiable(data["id"]) -# branch = session.branch() -# self.frame.show_job(branch, job).show_view(branch) -# return fmt_olink(branch, job, name=data["submitter"]) - + class SubmitterColumn(SqlTableColumn): + def render_title(self, session, data): + return "Submitter" + class SchedulerColumn(SqlTableColumn): def render_title(self, session, data): return "Scheduler" @@ -758,9 +752,9 @@ self.show_column(session, "global_job_id") self.show_column(session, "custom_id") self.show_column(session, "cmd") - #self.show_column(session, "submitter") self.show_column(session, "custom_group") self.show_column(session, "scheduler") + self.show_column(session, "submitter") self.show_column(session, "job_status") def render_sql_where(self, session, *args): Modified: mgmt/trunk/cumin/python/cumin/job.strings =================================================================== --- mgmt/trunk/cumin/python/cumin/job.strings 2008-09-12 19:03:21 UTC (rev 2463) +++ mgmt/trunk/cumin/python/cumin/job.strings 2008-09-12 19:32:44 UTC (rev 2464) @@ -10,7 +10,7 @@ j.custom_priority, j.job_status, j.global_job_id, -/* j.owner as submitter, */ + j.owner as submitter, j.title, s.name as scheduler, j.scheduler_id,