[rhmessaging-commits] rhmessaging commits: r3645 - in mgmt/trunk/cumin/python/cumin: usergrid and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2009-09-23 13:27:00 -0400 (Wed, 23 Sep 2009)
New Revision: 3645

Modified:
   mgmt/trunk/cumin/python/cumin/grid/model.py
   mgmt/trunk/cumin/python/cumin/grid/scheduler.py
   mgmt/trunk/cumin/python/cumin/usergrid/widgets.py
Log:
Add a submission create link to the user submission set

Modified: mgmt/trunk/cumin/python/cumin/grid/model.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/model.py	2009-09-23 15:48:00 UTC (rev 3644)
+++ mgmt/trunk/cumin/python/cumin/grid/model.py	2009-09-23 17:27:00 UTC (rev 3645)
@@ -41,9 +41,10 @@
         #return "Create submission to pool '%s'" % pool.name
 
     def do_enter(self, session, pool):
-        assert isinstance(pool, Pool)
+        if pool:
+            assert isinstance(pool, Pool)
 
-        self.form.pool.set(session, pool)
+            self.form.pool.set(session, pool)
 
     def do_invoke(self, completion, session, scheduler,
                   description, command, args):

Modified: mgmt/trunk/cumin/python/cumin/grid/scheduler.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/scheduler.py	2009-09-23 15:48:00 UTC (rev 3644)
+++ mgmt/trunk/cumin/python/cumin/grid/scheduler.py	2009-09-23 17:27:00 UTC (rev 3645)
@@ -93,8 +93,6 @@
     def __init__(self, app, name, pool):
         super(SchedulerSelectField, self).__init__(app, name)
 
-        assert isinstance(pool, PoolParameter)
-
         self.pool = pool
 
         self.param = SchedulerParameter(app, "param")
@@ -122,8 +120,12 @@
     class SchedulerOptions(OptionInputSet):
         def do_get_items(self, session):
             pool = self.parent.pool.get(session)
-            schedulers = list(Scheduler.selectBy(Pool=pool.id))
 
+            if pool:
+                schedulers = list(Scheduler.selectBy(Pool=pool.id))
+            else:
+                schedulers = list(Scheduler.select())
+
             return schedulers
 
         def render_item_value(self, session, item):

Modified: mgmt/trunk/cumin/python/cumin/usergrid/widgets.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/usergrid/widgets.py	2009-09-23 15:48:00 UTC (rev 3644)
+++ mgmt/trunk/cumin/python/cumin/usergrid/widgets.py	2009-09-23 17:27:00 UTC (rev 3645)
@@ -1,6 +1,8 @@
 from wooly import *
 from wooly.widgets import *
 
+import cumin.grid
+
 from cumin.parameters import *
 from cumin.widgets import *
 from cumin.util import *
@@ -48,6 +50,10 @@
         self.scheduler_col.visible = False
         self.submitter_col.visible = False
 
+        task = cumin.grid.module.submission_add
+        link = TaskLink(app, "add", task, None)
+        self.links.add_child(link)
+
     def render_sql_where(self, session):
         pass # XXX return "where m.name = %(name)s"