Author: justi9 Date: 2008-04-09 10:31:03 -0400 (Wed, 09 Apr 2008) New Revision: 1881 Modified: mgmt/cumin/python/cumin/model.py mgmt/cumin/python/cumin/system.py mgmt/cumin/python/cumin/system.strings Log: Change the system title in the ui metadata. Remove some unused code from SystemView. Use nodeNama as the name field in SystemSet. Modified: mgmt/cumin/python/cumin/model.py =================================================================== --- mgmt/cumin/python/cumin/model.py 2008-04-09 12:13:06 UTC (rev 1880) +++ mgmt/cumin/python/cumin/model.py 2008-04-09 14:31:03 UTC (rev 1881) @@ -472,6 +472,9 @@ #action.title = "Send Ping" #action.summary = True + def get_title(self, session): + return "System" + def get_icon_href(self, session): return "resource?name=system-36.png" Modified: mgmt/cumin/python/cumin/system.py =================================================================== --- mgmt/cumin/python/cumin/system.py 2008-04-09 12:13:06 UTC (rev 1880) +++ mgmt/cumin/python/cumin/system.py 2008-04-09 14:31:03 UTC (rev 1881) @@ -55,41 +55,13 @@ def __init__(self, app, name): super(SystemView, self).__init__(app, name) - self.summary = CuminSummary(app, "summary") - self.add_child(self.summary) + summary = CuminSummary(app, "summary") + self.add_child(summary) - self.status = SystemStatus(app, "status") - self.add_child(self.status) + status = SystemStatus(app, "status") + self.add_child(status) - self.tabs = TabbedModeSet(app, "tabs") - self.add_child(self.tabs) + self.__tabs = TabbedModeSet(app, "tabs") + self.add_child(self.__tabs) - self.tabs.add_tab(CuminDetails(app, "details")) - - def render_title(self, session, system): - return "System '%s'" % system.sysId - - def render_address(self, session, system): - return system.nodeName - - def render_kernel(self, session, system): - return system.osName - - def render_kernel_release(self, session, system): - return system.release - - def render_kernel_version(self, session, system): - return system.version - - def render_architecture(self, session, system): - return system.machine - - def render_created_deleted(self, session, system): - return "%s – %s" % (fmt_datetime(system.creationTime), - fmt_datetime(system.deletionTime)) - - def render_updated(self, session, system): - return fmt_datetime(system.recTime) - - def render_data_url(self, session, system): - return "model.xml" + self.__tabs.add_tab(CuminDetails(app, "details")) Modified: mgmt/cumin/python/cumin/system.strings =================================================================== --- mgmt/cumin/python/cumin/system.strings 2008-04-09 12:13:06 UTC (rev 1880) +++ mgmt/cumin/python/cumin/system.strings 2008-04-09 14:31:03 UTC (rev 1881) @@ -1,5 +1,5 @@ [SystemSet.sql] -select s.id, s.sys_id as name +select s.id, s.node_name as name from system as s {sql_orderby} {sql_limit}