Author: tmckay
Date: 2012-01-12 22:29:20 +0000 (Thu, 12 Jan 2012)
New Revision: 5185
Modified:
trunk/cumin/python/cumin/inventory/system.py
Log:
Merge revision 5184 from branch stability, BZ771642
Modified: trunk/cumin/python/cumin/inventory/system.py
===================================================================
--- trunk/cumin/python/cumin/inventory/system.py 2012-01-09 20:13:23 UTC (rev 5184)
+++ trunk/cumin/python/cumin/inventory/system.py 2012-01-12 22:29:20 UTC (rev 5185)
@@ -172,22 +172,50 @@
def __init__(self, app, name, system):
super(SystemTagSet, self).__init__(app, name)
self.system = system
+ self.main_tmpl = WidgetTemplate(self, "html")
def render_title(self, session):
return "Tags"
-
- def render_tags(self, session):
+
+ def _get_name(self, session):
+ node_name = ""
system = self.system.get(session)
try:
node_name = system.nodeName
except:
node_name = self.frame.id.get(session)
- tags = self.app.wallaby.get_tag_names(node_name)
-
+ return node_name
+
+ def render_tags(self, session):
+ node_name = self._get_name(session)
+ try:
+ tags = self.app.wallaby.get_tag_names(node_name)
+ except AttributeError:
+ tags = []
tags_string = ", ".join(tags)
return tags_string
+ def do_render(self, session, *args):
+ if self.defer_enabled and not getattr(session, "background", None):
+ writer = Writer()
+ self.__defer_tmpl.render(writer, session, *args)
+ return writer.to_string()
+ else:
+ writer = Writer()
+ # if we have an object, we're in good shape
+ # otherwise, show the "no content" template
+ node_name = self._get_name(session)
+ if self.frame.object.get(session) or \
+ type(node_name) in (str,unicode) and node_name != "":
+ self.main_tmpl.render(writer, session, *args)
+ else:
+ self.nocontent_tmpl.render(writer, session, *args)
+ return writer.to_string()
+
+ def render_error_msg(self, session, *args):
+ return "Host data may have changed. Return to the Inventory page and try
again"
+
class SystemTags(Widget):
def __init__(self, app, name, system):
super(SystemTags, self).__init__(app, name)
Show replies by date