r4678 - in trunk/cumin/python/cumin: grid usergrid

Author: eallen
Date: 2011-04-01 17:32:23 +0000 (Fri, 01 Apr 2011)
New Revision: 4678

Modified:
   trunk/cumin/python/cumin/grid/negotiator.py
   trunk/cumin/python/cumin/grid/submission.py
   trunk/cumin/python/cumin/usergrid/widgets.py
Log:
Remove the unneeded checkboxes from the submissions list

Modified: trunk/cumin/python/cumin/grid/negotiator.py
===================================================================
--- trunk/cumin/python/cumin/grid/negotiator.py	2011-04-01 13:08:52 UTC (rev 4677)
+++ trunk/cumin/python/cumin/grid/negotiator.py	2011-04-01 17:32:23 UTC (rev 4678)
@@ -55,7 +55,6 @@
         # avoid the checkboxes
         return ObjectTable(app, name, cls)
 
-
 class GroupHelper(Widget):
     def __init__(self, app, name, negotiator):
         super(GroupHelper, self).__init__(app, name)

Modified: trunk/cumin/python/cumin/grid/submission.py
===================================================================
--- trunk/cumin/python/cumin/grid/submission.py	2011-04-01 13:08:52 UTC (rev 4677)
+++ trunk/cumin/python/cumin/grid/submission.py	2011-04-01 17:32:23 UTC (rev 4678)
@@ -7,7 +7,7 @@
 from cumin.objectframe import ObjectFrame
 from cumin.sqladapter import ObjectSqlAdapter
 from cumin.objectselector import ObjectSelector, ObjectLinkColumn,\
-    ObjectTableColumn
+    ObjectTableColumn, ObjectTable
 from cumin.task import TaskLink, Task, ObjectTaskForm
 from cumin.parameters import ObjectAttribute
 
@@ -75,6 +75,10 @@
         self.add_attribute_column(cls.Completed)
         self.add_attribute_column(cls.Held)
 
+    def create_table(self, app, name, cls):
+        # avoid the checkboxes
+        return ObjectTable(app, name, cls)
+
 class PoolSubmissionSelector(SubmissionSelector):
     def __init__(self, app, name, pool):
         super(PoolSubmissionSelector, self).__init__(app, name)
@@ -86,12 +90,12 @@
 
         frame = "main.grid.submission"
         col = ObjectLinkColumn(app, "name", self.cls.Name, self.cls._id,
frame)
-        self.insert_column(1, col)
+        self.insert_column(0, col)
         self.add_search_filter(col)
 
         attr = self.cls.Owner
         col = ObjectTableColumn(app, attr.name, attr)
-        self.insert_column(2, col)
+        self.insert_column(1, col)
 
         link = self.PoolSubmitLink(app, "job_submit", app.grid.job_submit)
         self.links.add_child(link)
@@ -119,7 +123,7 @@
 
         frame = "main.grid.scheduler"
         col = self.SchedulerColumn(app, "Scheduler", scheduler.Name,
scheduler._id, frame)
-        self.insert_column(3, col)
+        self.insert_column(2, col)
 
         self.enable_csv_export(pool)
 

Modified: trunk/cumin/python/cumin/usergrid/widgets.py
===================================================================
--- trunk/cumin/python/cumin/usergrid/widgets.py	2011-04-01 13:08:52 UTC (rev 4677)
+++ trunk/cumin/python/cumin/usergrid/widgets.py	2011-04-01 17:32:23 UTC (rev 4678)
@@ -113,7 +113,7 @@
 
         frame = "main.submissions.submission"
         col = ObjectLinkColumn(app, "name", self.cls.Name, self.cls._id,
frame)
-        self.insert_column(1, col)
+        self.insert_column(0, col)
         self.add_search_filter(col)
 
         link = TaskLink(app, "job_submit", app.grid.job_submit)