[rhmessaging-commits] rhmessaging commits: r2526 - mgmt/trunk/cumin/python/cumin.

Author: eallen Date: 2008-09-22 15:48:09 -0400 (Mon, 22 Sep 2008) New Revision: 2526 Modified: mgmt/trunk/cumin/python/cumin/scheduler.py mgmt/trunk/cumin/python/cumin/submitter.py Log: Tied in Submitter to use Job.submitter Modified: mgmt/trunk/cumin/python/cumin/scheduler.py =================================================================== --- mgmt/trunk/cumin/python/cumin/scheduler.py 2008-09-22 19:47:10 UTC (rev 2525) +++ mgmt/trunk/cumin/python/cumin/scheduler.py 2008-09-22 19:48:09 UTC (rev 2526) @@ -64,6 +64,8 @@ def show_jobs_remove(self, session): return self.frame.show_jobs_remove(session) + def show_submitter(self, session, submitter): + return self.frame.show_submitter(session, submitter) class SchedulerView(CuminView): def __init__(self, app, name): @@ -141,18 +143,12 @@ self.__release = JobReleaseButton(app, "release", self) self.add_child(self.__release) - def do_process(self, session, *args): - 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, "job_status") - super(SchedulerJobSet, self).do_process(session, *args) - + def get_visible_columns(self, session): + return self.get_request_visible_columns(session, ["custom_group", "submitter"]) + def render_sql_where(self, session, scheduler): phase_sql = self.get_phase_sql(session) - scheduler_sql = "scheduler_id = %i" % scheduler.id + scheduler_sql = "j.scheduler_id = %i" % scheduler.id return "where %s" % " and ".join([phase_sql, scheduler_sql]) def render_title(self, session, scheduler): Modified: mgmt/trunk/cumin/python/cumin/submitter.py =================================================================== --- mgmt/trunk/cumin/python/cumin/submitter.py 2008-09-22 19:47:10 UTC (rev 2525) +++ mgmt/trunk/cumin/python/cumin/submitter.py 2008-09-22 19:48:09 UTC (rev 2526) @@ -132,21 +132,15 @@ self.__release = JobReleaseButton(app, "release", self) self.add_child(self.__release) - def do_process(self, session, *args): - self.show_column(session, "global_job_id") - self.show_column(session, "custom_id") - self.show_column(session, "cmd") - self.show_column(session, "scheduler") - self.show_column(session, "custom_group") - self.show_column(session, "job_status") - super(SubmitterJobSet, self).do_process(session, *args) - + def get_visible_columns(self, session): + return self.get_request_visible_columns(session, ["custom_group", "scheduler"]) + def render_sql_where(self, session, submitter): phase_sql = self.get_phase_sql(session) - submitter_sql = "owner = '%s'" % submitter.Name + submitter_sql = "j.submitter_id = %i" % submitter.id return "where %s" % " and ".join([phase_sql, submitter_sql]) def render_title(self, session, submitter): - submitter_sql = "owner = '%s'" % submitter.Name + submitter_sql = "submitter_id = %i" % submitter.id return "Jobs %s" % fmt_count(Job.select(submitter_sql).count())