r5490 - in trunk/cumin/python/cumin: . usergrid
by croberts@fedoraproject.org
Author: croberts
Date: 2012-10-01 15:45:32 +0000 (Mon, 01 Oct 2012)
New Revision: 5490
Modified:
trunk/cumin/python/cumin/objectselector.py
trunk/cumin/python/cumin/usergrid/widgets.py
Log:
Handful of fixes for the usergrid version of the submission view/search page.
Modified: trunk/cumin/python/cumin/objectselector.py
===================================================================
--- trunk/cumin/python/cumin/objectselector.py 2012-09-28 20:15:57 UTC (rev 5489)
+++ trunk/cumin/python/cumin/objectselector.py 2012-10-01 15:45:32 UTC (rev 5490)
@@ -376,8 +376,13 @@
customfield = self.parent.select_input.get(session)
customvalue = self.parent.selectablefilters.children_by_name['search'].get(session)
operator = self.parent.select_input.operator_param.get(session)
-
- #since these are added at runtime, we need to clear out the old ones each time around
+
+ #we need to factor-in filter_specs that may have been placed on the table
+ for this, that, fobj in self.parent.table.filter_specs:
+ obj = fobj.get(session)
+ values[this.name] = getattr(obj, that.name)
+
+ #since these are added at runtime, we need to clear out the old ones each time around
self.adapter.query.filters = [filter for filter in self.adapter.query.filters if not isinstance(filter, self.SelectableFieldFilter)]
if customfield is None or customvalue is None or customvalue == "":
return values
Modified: trunk/cumin/python/cumin/usergrid/widgets.py
===================================================================
--- trunk/cumin/python/cumin/usergrid/widgets.py 2012-09-28 20:15:57 UTC (rev 5489)
+++ trunk/cumin/python/cumin/usergrid/widgets.py 2012-10-01 15:45:32 UTC (rev 5490)
@@ -115,7 +115,7 @@
frame = "main.submissions.submission"
col = self.UserSubmissionObjectLinkColumn(app, "name", self.cls.Name, self.cls._id, frame)
self.insert_column(0, col)
- self.add_search_filter(col)
+ #self.add_search_filter(col)
link = TaskLink(app, "job_submit", app.grid.job_submit)
self.links.add_child(link)
@@ -128,6 +128,18 @@
self.enable_csv_export(user)
+ def create_table(self, app, name, cls):
+ return SelectableSearchObjectTable(app, name, cls)
+
+ class SubmissionFieldOptions(SelectableSearchObjectTable.SearchFieldOptions):
+ def __init__(self, app, param):
+ super(UserSubmissionSelector.SubmissionFieldOptions, self).__init__(app, param)
+ self.cls = app.model.com_redhat_grid.Submission
+
+ def do_get_items(self, session):
+ return [self.cls.Name, self.cls.QDate, self.cls.Idle, \
+ self.cls.Running, self.cls.Completed, self.cls.Held, self.cls.Suspended]
+
class UserSubmissionObjectLinkColumn(ObjectLinkColumn):
def render_cell_content(self, session, record):
retval = len(record) > 0 and record[self.field.index] or ""
11 years, 7 months