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

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2008-10-30 17:04:47 -0400 (Thu, 30 Oct 2008)
New Revision: 2709

Modified:
   mgmt/trunk/cumin/python/cumin/job.py
   mgmt/trunk/cumin/python/cumin/job.strings
Log:
Fix Job search. It was missing support for the new pool SQL.

Modified: mgmt/trunk/cumin/python/cumin/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.py	2008-10-30 21:03:57 UTC (rev 2708)
+++ mgmt/trunk/cumin/python/cumin/job.py	2008-10-30 21:04:47 UTC (rev 2709)
@@ -232,8 +232,8 @@
     def render_find_sql_where(self, session, *args):
         return "j.custom_id = %(custom_id)s"
     
-    def get_find_sql_values(self, session, *args):
-        return {"custom_id": self.job_search.get(session)}
+    def get_find_sql_values(self, session, pool):
+        return {"custom_id": self.job_search.get(session), "pool": pool.id}
     
     def get_visible_columns(self, session):
         return self.get_request_visible_columns(session, ["custom_group", "scheduler", "submitter"])

Modified: mgmt/trunk/cumin/python/cumin/job.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/job.strings	2008-10-30 21:03:57 UTC (rev 2708)
+++ mgmt/trunk/cumin/python/cumin/job.strings	2008-10-30 21:04:47 UTC (rev 2709)
@@ -31,6 +31,7 @@
 from job as j
 left outer join job_stats as c on c.id = j.stats_curr_id
 left outer join job_stats as p on p.id = j.stats_prev_id
+inner join scheduler as s on s.id = j.scheduler_id
 
 [JobSet.count_sql]
 select count(1)