Author: croberts
Date: 2011-08-05 21:06:27 +0000 (Fri, 05 Aug 2011)
New Revision: 4911
Modified:
trunk/cumin/python/cumin/grid/pool.py
trunk/cumin/python/cumin/grid/tags.py
Log:
Changing the order of the tabs under Grid to put Tags near the end, also adding some pydoc
for the tags package.
Modified: trunk/cumin/python/cumin/grid/pool.py
===================================================================
--- trunk/cumin/python/cumin/grid/pool.py 2011-08-05 20:51:31 UTC (rev 4910)
+++ trunk/cumin/python/cumin/grid/pool.py 2011-08-05 21:06:27 UTC (rev 4911)
@@ -101,14 +101,14 @@
self.edit_dynamic_quota = NegotiatorEditDynamicQuota(app, self)
self.quotas = QuotaSelector(app, "quotas", self.negotiator_attribute,
self)
self.view.add_tab(self.quotas)
+
+ self.limits = LimitSelector(app, "limits")
+ self.view.add_tab(self.limits)
self.edit_node_tags = TagsNodeEditTask(app, self)
config_editor = TagsEditor(app, "wallaby")
self.view.add_tab(config_editor)
- self.limits = LimitSelector(app, "limits")
- self.view.add_tab(self.limits)
-
self.top_tab = True
def render_title(self, session):
Modified: trunk/cumin/python/cumin/grid/tags.py
===================================================================
--- trunk/cumin/python/cumin/grid/tags.py 2011-08-05 20:51:31 UTC (rev 4910)
+++ trunk/cumin/python/cumin/grid/tags.py 2011-08-05 21:06:27 UTC (rev 4911)
@@ -125,12 +125,12 @@
return data
-class ObjectSelectorTableNoCheckboxes(ObjectSelector):
+class ObjectSelectorNoCheckboxes(ObjectSelector):
'''
All of the ObjectSelector goodness, but without the checkboxes that come from the
default ObjectSelectorTable
'''
def __init__(self, app, name, cls):
- super(ObjectSelectorTableNoCheckboxes, self).__init__(app, name, cls)
+ super(ObjectSelectorNoCheckboxes, self).__init__(app, name, cls)
def create_table(self, app, name, cls):
''' override the default to give us a plain ObjectTable rather than
and ObjectSelectorTable '''
@@ -143,7 +143,10 @@
self.set_tags = TagsNodeEditTask(app, self)
self.set_nodes = TagsTagEditTask(app, self)
-class TagInventory(ObjectSelectorTableNoCheckboxes):
+class TagInventory(ObjectSelectorNoCheckboxes):
+ '''
+ Table that will display the list of all tags across the system.
+ '''
def __init__(self, app, name):
cls = app.model.com_redhat_cumin_grid.Node
super(TagInventory, self).__init__(app, name, cls)
@@ -180,7 +183,11 @@
return fmt_link(href, tags)
-class NodeInventory(ObjectSelectorTableNoCheckboxes):
+class NodeInventory(ObjectSelectorNoCheckboxes):
+ '''
+ Table that will display the list of nodes, their (possibly abbreviated) list of tags
and
+ the last checkin time for that node.
+ '''
def __init__(self, app, name):
cls = app.model.com_redhat_cumin_grid.Node
super(NodeInventory, self).__init__(app, name, cls)
@@ -443,6 +450,9 @@
class EditNodeTagsForm(ObjectFrameTaskFeedbackForm):
+ '''
+ This form is designed to allow the editing of tags for any single node
+ '''
def __init__(self, app, name, task):
super(EditNodeTagsForm, self).__init__(app, name, task)
@@ -565,6 +575,9 @@
pass
class EditTagNodesForm(ObjectFrameTaskFeedbackForm):
+ '''
+ This form will allow the editing of nodes for a single given tag
+ '''
def __init__(self, app, name, task):
super(EditTagNodesForm, self).__init__(app, name, task)
@@ -850,7 +863,7 @@
tag_list = list()
for i, tag in enumerate(wallaby_tags):
- tag_list.append(xml_escape(str(tag.name)))
+ tag_list.append(str(tag.name))
tag_list.sort()
return tag_list
@@ -863,7 +876,7 @@
node_list = list()
for i, node in enumerate(wallaby_nodes):
- node_list.append(xml_escape(node.name))
+ node_list.append(str(node.name))
node_list.sort()
return node_list
\ No newline at end of file