[rhmessaging-commits] rhmessaging commits: r3668 - in mgmt/trunk/cumin/python/cumin: usergrid and 1 other directory.
rhmessaging-commits at lists.jboss.org
rhmessaging-commits at lists.jboss.org
Mon Oct 5 14:34:36 EDT 2009
Author: justi9
Date: 2009-10-05 14:34:36 -0400 (Mon, 05 Oct 2009)
New Revision: 3668
Modified:
mgmt/trunk/cumin/python/cumin/grid/pool.py
mgmt/trunk/cumin/python/cumin/grid/scheduler.py
mgmt/trunk/cumin/python/cumin/grid/submission.py
mgmt/trunk/cumin/python/cumin/usergrid/widgets.py
Log:
* Move the href getters to the more specific variants of
SubmissionSet
* Introduce extra frames into usergrid ui so we can add
single-submission and single-slot frames
Modified: mgmt/trunk/cumin/python/cumin/grid/pool.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/pool.py 2009-10-05 17:48:58 UTC (rev 3667)
+++ mgmt/trunk/cumin/python/cumin/grid/pool.py 2009-10-05 18:34:36 UTC (rev 3668)
@@ -13,7 +13,7 @@
from job import *
from scheduler import SchedulerSet, SchedulerFrame
-from submission import SubmissionSet
+from submission import *
from submitter import SubmitterSet, SubmitterFrame
from collector import CollectorSet, CollectorFrame
from negotiator import NegotiatorSet, NegotiatorFrame
@@ -85,6 +85,9 @@
self.view = PoolView(app, "view", self.object)
self.add_mode(self.view)
+ self.submission = SubmissionFrame(app, "submission")
+ self.add_mode(self.submission)
+
self.job = JobFrame(app, "job")
self.add_mode(self.job)
@@ -151,6 +154,19 @@
link = TaskLink(app, "add", task, self.pool)
self.links.add_child(link)
+ def get_submission_href(self, session, id):
+ submission = Identifiable(id)
+ return main.module.frame.pool.submission.get_href(session, submission)
+
+ def get_submitter_href(self, session, id):
+ submitter = Identifiable(id)
+ return main.module.frame.pool.scheduler.submitter.get_href \
+ (session, submitter)
+
+ def get_scheduler_href(self, session, id):
+ scheduler = Identifiable(id)
+ return main.module.frame.pool.scheduler.get_href(session, scheduler)
+
def render_sql_where(self, session):
return "where d.pool = %(pool)s"
@@ -467,4 +483,4 @@
def render_content(self, session):
return self.flash_chart.render(session)
-
\ No newline at end of file
+
Modified: mgmt/trunk/cumin/python/cumin/grid/scheduler.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/scheduler.py 2009-10-05 17:48:58 UTC (rev 3667)
+++ mgmt/trunk/cumin/python/cumin/grid/scheduler.py 2009-10-05 18:34:36 UTC (rev 3668)
@@ -148,9 +148,6 @@
self.view = SchedulerView(app, "view", self.object)
self.add_mode(self.view)
- self.submission = SubmissionFrame(app, "submission")
- self.add_mode(self.submission)
-
self.submitter = SubmitterFrame(app, "sub", self.object)
self.add_mode(self.submitter)
Modified: mgmt/trunk/cumin/python/cumin/grid/submission.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/grid/submission.py 2009-10-05 17:48:58 UTC (rev 3667)
+++ mgmt/trunk/cumin/python/cumin/grid/submission.py 2009-10-05 18:34:36 UTC (rev 3668)
@@ -35,17 +35,13 @@
self.add_column(col)
def get_submission_href(self, session, id):
- submission = Identifiable(id)
- return main.module.frame.pool.scheduler.submission.get_href \
- (session, submission)
+ raise Exception("Not implemented")
def get_submitter_href(self, session, id):
- submitter = Identifiable(id)
- return main.module.frame.pool.scheduler.submitter.get_href \
- (session, submitter)
+ raise Exception("Not implemented")
def get_scheduler_href(self, session, id):
- pass
+ raise Exception("Not implemented")
def render_title(self, session):
return "Submissions %s" % fmt_count(self.get_item_count(session))
@@ -98,9 +94,6 @@
self.view = SubmissionView(app, "view", self.object)
self.add_child(self.view)
- def render_title(self, session):
- return "Submission"
-
class SubmissionView(CuminView):
def __init__(self, app, name, submission):
super(SubmissionView, self).__init__(app, name, submission)
Modified: mgmt/trunk/cumin/python/cumin/usergrid/widgets.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/usergrid/widgets.py 2009-10-05 17:48:58 UTC (rev 3667)
+++ mgmt/trunk/cumin/python/cumin/usergrid/widgets.py 2009-10-05 18:34:36 UTC (rev 3668)
@@ -15,7 +15,10 @@
from model import *
from widgets import *
+import main
+
strings = StringCatalog(__file__)
+log = logging.getLogger("cumin.usergrid.widgets")
class MainPage(CuminPage, ModeSet):
def __init__(self, app, name):
@@ -35,10 +38,10 @@
self.overview = OverviewFrame(app, "overview", user)
self.add_tab(self.overview)
- self.submissions = UserSubmissionSet(app, "submissions", user)
+ self.submissions = SubmissionsFrame(app, "submissions", user)
self.add_tab(self.submissions)
- self.slots = UserSlotSet(app, "slots", user)
+ self.slots = SlotsFrame(app, "slots", user)
self.add_tab(self.slots)
class OverviewFrame(CuminFrame):
@@ -61,6 +64,19 @@
self.stats = UserSlotStatSet(self.app, "slots", user)
self.add_child(self.stats)
+class SubmissionsFrame(CuminFrame):
+ def __init__(self, app, name, user):
+ super(SubmissionsFrame, self).__init__(app, name)
+
+ self.view = UserSubmissionSet(app, "view", user)
+ self.add_mode(self.view)
+
+ self.submission = SubmissionFrame(app, "submission")
+ self.add_mode(self.submission)
+
+ def render_title(self, session):
+ return "Submissions"
+
class UserSubmissionSet(SubmissionSet):
def __init__(self, app, name, user):
super(UserSubmissionSet, self).__init__(app, name)
@@ -74,6 +90,11 @@
link = TaskLink(app, "add", task, None)
self.links.add_child(link)
+ def get_submission_href(self, session, id):
+ submission = Identifiable(id)
+ return self.page.main.submissions.submission.get_href \
+ (session, submission)
+
def render_sql_where(self, session):
pass # XXX return "where m.name = %(name)s"
@@ -81,6 +102,19 @@
user = self.page.user.get(session)
return {"name": user.name}
+class SlotsFrame(CuminFrame):
+ def __init__(self, app, name, user):
+ super(SlotsFrame, self).__init__(app, name)
+
+ self.view = UserSlotSet(app, "view", user)
+ self.add_mode(self.view)
+
+ self.slot = SlotFrame(app, "slot")
+ self.add_mode(self.slot)
+
+ def render_title(self, session):
+ return "Slots"
+
class UserSlotSet(SlotSet):
def __init__(self, app, name, user):
super(UserSlotSet, self).__init__(app, name)
More information about the rhmessaging-commits
mailing list