[rhmessaging-commits] rhmessaging commits: r4313 - in mgmt/newdata/cumin/python/cumin: grid and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2010-09-20 17:04:34 -0400 (Mon, 20 Sep 2010)
New Revision: 4313

Modified:
   mgmt/newdata/cumin/python/cumin/grid/limit.py
   mgmt/newdata/cumin/python/cumin/grid/negotiator.py
   mgmt/newdata/cumin/python/cumin/widgets.py
   mgmt/newdata/cumin/python/cumin/widgets.strings
Log:
Don't allow sort on limits and quotas table columns.
Indent quota group name based on level in hierarchy

Modified: mgmt/newdata/cumin/python/cumin/grid/limit.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/limit.py	2010-09-20 21:00:53 UTC (rev 4312)
+++ mgmt/newdata/cumin/python/cumin/grid/limit.py	2010-09-20 21:04:34 UTC (rev 4313)
@@ -85,7 +85,7 @@
     def render_title(self, session):
         return "Limits"
 
-    class NameColumn(ItemTableColumn):
+    class NameColumn(NonSortableTableColumn):
         def render_title(self, session):
             return "Name"
 
@@ -97,11 +97,11 @@
             href = self.frame.limit.set_limit.get_href(session)
             return fmt_link(href, limit)
 
-    class CurrentColumn(ItemTableColumn):
+    class CurrentColumn(NonSortableTableColumn):
         def render_title(self, session):
             return "Current Usage"
 
-    class MaxColumn(ItemTableColumn):
+    class MaxColumn(NonSortableTableColumn):
         def render_title(self, session):
             return "Max Allowance"
 

Modified: mgmt/newdata/cumin/python/cumin/grid/negotiator.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/grid/negotiator.py	2010-09-20 21:00:53 UTC (rev 4312)
+++ mgmt/newdata/cumin/python/cumin/grid/negotiator.py	2010-09-20 21:04:34 UTC (rev 4313)
@@ -53,7 +53,7 @@
     def __init__(self, app, name, getter, negotiator, task):
         super(QmfGroupColumn, self).__init__(app, name)
 
-        self.header_class = ItemTableColumnHeader
+        self.header_class = StaticTableColumnHeader
 
         self.title = None
         self.getter = getter
@@ -197,15 +197,17 @@
 
             return fmt_link(branch.marshal(), state, class_=cls, link_title=hover)
 
-    class GroupColumn(ItemTableColumn):
+    class GroupColumn(NonSortableTableColumn):
         def render_title(self, session, *args):
             return "Name"
 
         def render_content(self, session, group):
             # if a user
             if "." in group:
-                (g, sep, user) = rpartition(group, ".")
-                return "<span style='padding-left: 1em;'>%s</span>" % user
+                parts = group.split('.')
+                indent = len(parts) - 1
+                user = parts[indent]
+                return "<span style='padding-left: %dem;'>%s</span>" % (indent, user)
 
             return group
 

Modified: mgmt/newdata/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/widgets.py	2010-09-20 21:00:53 UTC (rev 4312)
+++ mgmt/newdata/cumin/python/cumin/widgets.py	2010-09-20 21:04:34 UTC (rev 4313)
@@ -914,6 +914,15 @@
         def get_default(self, session):
             return datetime.now() - timedelta(minutes=10)
 
+class StaticTableColumnHeader(ItemTableColumnHeader):
+    pass
+
+class NonSortableTableColumn(ItemTableColumn):
+    def __init__(self, app, name):
+        super(NonSortableTableColumn, self).__init__(app, name)
+
+        self.header_class = StaticTableColumnHeader
+
 class PaginatedItemSet(ItemSet):
     def __init__(self, app, name):
         super(PaginatedItemSet, self).__init__(app, name)

Modified: mgmt/newdata/cumin/python/cumin/widgets.strings
===================================================================
--- mgmt/newdata/cumin/python/cumin/widgets.strings	2010-09-20 21:00:53 UTC (rev 4312)
+++ mgmt/newdata/cumin/python/cumin/widgets.strings	2010-09-20 21:04:34 UTC (rev 4313)
@@ -866,3 +866,6 @@
 );
 //]]>
 </script>
+
+[StaticTableColumnHeader.html]
+<th {attrs}>{content}</th>