9:56 a.m.
Author: eallen
Date: 2009-05-29 10:56:41 -0400 (Fri, 29 May 2009)
New Revision: 3407
Modified:
mgmt/trunk/cumin/python/cumin/grid/job.py
mgmt/trunk/cumin/python/cumin/grid/job.strings
Log:
Change JobsAndGroupsTab to a TabbedModeSet to avoid extraneous sql calls
Modified: mgmt/trunk/cumin/python/cumin/grid/job.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/job.py 2009-05-29 14:48:07 UTC (rev 3406)
+++ mgmt/trunk/cumin/python/cumin/grid/job.py 2009-05-29 14:56:41 UTC (rev 3407)
@@ -251,6 +251,9 @@
self.job_search = self.JobSearch(app, "job_search")
self.add_child(self.job_search)
+ def render_title(self, session, *args):
+ return "Jobs"
+
def find_job(self, session):
search_term = self.job_search.get(session)
@@ -279,7 +282,7 @@
#return {"custom_id": self.job_search.get(session), "pool":
pool.id}
def get_full_item_count(self, session, *args):
- # request item count will phase=="a"
+ # request item count with phase=="a"
new_args = (args[0], "a")
return self.get_item_count(session, *new_args)
@@ -1036,9 +1039,9 @@
col = self.GroupColumn(app, "job_group")
self.add_column(col)
- col = self.JobsCountColumn(app, "jobs")
- col.alignment = "right"
- self.add_column(col)
+ #col = self.JobsCountColumn(app, "jobs")
+ #col.alignment = "right"
+ #self.add_column(col)
class GroupColumn(SqlTableColumn):
def render_title(self, session, data):
@@ -1057,50 +1060,23 @@
def render_title(self, session, data):
return "Jobs"
-class JobsAndGroupsTab(Widget):
+class JobsAndGroupsTab(TabbedModeSet):
def __init__(self, app, name):
super(JobsAndGroupsTab, self).__init__(app, name)
- self.is_group = GroupSwitch(app, "group")
- self.add_child(self.is_group)
+ self.jobs_tab = JobTab(app, "jobtab")
+ self.add_tab(self.jobs_tab)
+ self.add_tab(JobGroupTab(app, "jobgrouptab"))
- self.job_tab = JobTab(app, "jobtab")
- self.add_child(self.job_tab)
-
- self.job_group_tab = JobGroupTab(app, "jobgrouptab")
- self.add_child(self.job_group_tab)
-
def get_args(self, session):
return self.frame.get_args(session)
def render_title(self, session, *args):
- return "Jobs %s" % fmt_count(self.job_tab.get_full_item_count(session,
*args))
+ return "Jobs %s" % fmt_count(self.jobs_tab.get_full_item_count(session,
*args))
- def show_status_switch(self, session):
- is_group = self.is_group.get(session)
- return is_group == "j"
-
- def set_switch(self, session, switch):
- if switch == "group":
- self.is_group.set(session, "g")
- else:
- self.is_group.set(session, "j")
-
def render_phase(self, session, *args):
- is_group = self.is_group.get(session)
- if is_group == "j":
- return self.job_tab.phase.render(session)
+ return self.mode.get(session) == self.jobs_tab and
self.jobs_tab.phase.render(session)
- def render_jobs(self, session, *args):
- is_group = self.is_group.get(session)
- if is_group == "j":
- return self.job_tab.render(session)
-
- def render_job_groups(self, session, *args):
- is_group = self.is_group.get(session)
- if is_group == "g":
- return self.job_group_tab.render(session)
-
class JobGroupTab(JobGroupSet, Form):
def __init__(self, app, name):
super(JobGroupTab, self).__init__(app, name)
@@ -1116,6 +1092,9 @@
self.set_default_column_name("job_group")
+ def render_title(self, session, *args):
+ return "Job Groups"
+
class Remove(FormButton):
def process_submit(self, session):
ids = self.parent.ids.get(session)
Modified: mgmt/trunk/cumin/python/cumin/grid/job.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/job.strings 2009-05-29 14:48:07 UTC (rev 3406)
+++ mgmt/trunk/cumin/python/cumin/grid/job.strings 2009-05-29 14:56:41 UTC (rev 3407)
@@ -162,12 +162,10 @@
[JobsAndGroupsTab.html]
- <div class="rfloat">{phase}</div>
-{group}
+<div style="float: right;">{phase}</div>
+<ul class="radiotabs tabs">{tabs}</ul>
+<div class="radiotabs mode">{content}</div>
-{jobs}{job_groups}
-
-
[JobGroupTab.html]
<form id="{id}" method="post" action="?">
<div class="sactions">