Author: tmckay Date: 2013-07-26 16:08:31 +0000 (Fri, 26 Jul 2013) New Revision: 5781
Modified: branches/statusquo/cumin/python/cumin/grid/pool.py branches/statusquo/cumin/python/cumin/grid/slotvis.py Log: Promote slot table to tab level in slot vis. BZ964237
Modified: branches/statusquo/cumin/python/cumin/grid/pool.py =================================================================== --- branches/statusquo/cumin/python/cumin/grid/pool.py 2013-07-26 15:47:19 UTC (rev 5780) +++ branches/statusquo/cumin/python/cumin/grid/pool.py 2013-07-26 16:08:31 UTC (rev 5781) @@ -16,7 +16,7 @@ NegotiatorEditDynamicQuota from limit import LimitFrame, LimitSelector from cumin.grid.quota import QuotaSelector -from cumin.grid.slotvis import SlotOverview +from cumin.grid.slotvis import SlotSelector from cumin.parameters import YoungestAttribute
strings = StringCatalog(__file__) @@ -86,7 +86,7 @@ submissions = PoolSubmissionJoinSelector(app, "pool_submissions") self.view.add_tab(submissions)
- slots = SlotOverview(app, "slots") + slots = SlotSelector(app, "slots") self.view.add_tab(slots)
schedulers = SchedulerSelector(app, "schedulers")
Modified: branches/statusquo/cumin/python/cumin/grid/slotvis.py =================================================================== --- branches/statusquo/cumin/python/cumin/grid/slotvis.py 2013-07-26 15:47:19 UTC (rev 5780) +++ branches/statusquo/cumin/python/cumin/grid/slotvis.py 2013-07-26 16:08:31 UTC (rev 5781) @@ -15,15 +15,19 @@ strings = StringCatalog(__file__) log = logging.getLogger("cumin.slotvis")
-class SlotOverview(RadioModeSet): - def __init__(self, app, name): - super(SlotOverview, self).__init__(app, name) +# Since the slot vis contains only the table +# at this point, promote the table to the tab +# level. Leave this here in case we add something back
- self.add_tab(SlotSelector(app, "slots")) +#class SlotOverview(RadioModeSet): +# def __init__(self, app, name): +# super(SlotOverview, self).__init__(app, name) +# +# self.add_tab(SlotSelector(app, "slots")) +# +# def render_title(self, session): +# return "Slots"
- def render_title(self, session): - return "Slots" - class SlotSelector(ObjectSelector): def __init__(self, app, name): cls = app.model.com_redhat_grid.Slot @@ -53,8 +57,9 @@ # avoid the checkboxes return SelectableSearchObjectTable(app, name, cls)
- def render_title(self, session): - return "Slot table" +# USe the default title if we're tab level +# def render_title(self, session): +# return "Slot table"
class SlotFieldOptions(SelectableSearchObjectTable.SearchFieldOptions): def __init__(self, app, param):