Author: eallen Date: 2010-05-13 10:01:42 -0400 (Thu, 13 May 2010) New Revision: 3968 Modified: mgmt/newdata/cumin/python/cumin/grid/scheduler.py mgmt/newdata/cumin/python/cumin/grid/submission.py Log: Fixed up SubmissionAddForm's Scheduler field Modified: mgmt/newdata/cumin/python/cumin/grid/scheduler.py =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/scheduler.py 2010-05-13 11:35:46 UTC (rev 3967) +++ mgmt/newdata/cumin/python/cumin/grid/scheduler.py 2010-05-13 14:01:42 UTC (rev 3968) @@ -70,11 +70,9 @@ self.stop = DaemonSelectionStop(app, self, "SCHEDD") class SchedulerSelectField(ScalarField): - def __init__(self, app, name, pool): + def __init__(self, app, name): super(SchedulerSelectField, self).__init__(app, name, None) - self.pool = pool - self.param = SchedulerParameter(app, "param") self.add_parameter(self.param) @@ -97,17 +95,18 @@ class SchedulerOptions(OptionInputSet): def do_get_items(self, session): - pool = self.parent.pool.get(session) + collector = self.form.object.get(session) - if pool: - schedulers = list(Scheduler.selectBy(Pool=pool.id)) + cls = self.app.model.mrg_grid.Scheduler + if collector: + schedulers = cls.get_selection(session.cursor, Pool=collector.Pool) else: - schedulers = list(Scheduler.select()) + schedulers = cls.get_selection(session.cursor) return schedulers def render_item_value(self, session, item): - return item.id + return item._id def render_item_content(self, session, item): return item.Name Modified: mgmt/newdata/cumin/python/cumin/grid/submission.py =================================================================== --- mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-05-13 11:35:46 UTC (rev 3967) +++ mgmt/newdata/cumin/python/cumin/grid/submission.py 2010-05-13 14:01:42 UTC (rev 3968) @@ -94,13 +94,9 @@ def __init__(self, app, name, task): super(SubmissionAddForm, self).__init__(app, name, task) - # XXX - self.pool = PoolParameter(app, "pool") - self.add_parameter(self.pool) - from scheduler import SchedulerSelectField # XXX - self.scheduler = SchedulerSelectField(app, "scheduler", self.pool) + self.scheduler = SchedulerSelectField(app, "scheduler") self.scheduler.required = True self.scheduler.help = "Create submission at this scheduler" self.add_field(self.scheduler)