Author: justi9 Date: 2008-09-15 11:58:02 -0400 (Mon, 15 Sep 2008) New Revision: 2474 Modified: mgmt/trunk/cumin/python/cumin/binding.py mgmt/trunk/cumin/python/cumin/brokerlink.py mgmt/trunk/cumin/python/wooly/__init__.py mgmt/trunk/cumin/python/wooly/forms.py Log: Generalize and replace get_parent_named on FormField with get_ancestor(name) on Widget Modified: mgmt/trunk/cumin/python/cumin/binding.py =================================================================== --- mgmt/trunk/cumin/python/cumin/binding.py 2008-09-15 14:44:23 UTC (rev 2473) +++ mgmt/trunk/cumin/python/cumin/binding.py 2008-09-15 15:58:02 UTC (rev 2474) @@ -284,8 +284,7 @@ return self.phase.path def get_args(self, session): - broker = self.get_parent_named("broker") - reg = broker.get_object(session) + reg = self.frame.get_ancestor("broker").get_object(session) return (reg.getDefaultVhost(),) class Errors(Attribute): Modified: mgmt/trunk/cumin/python/cumin/brokerlink.py =================================================================== --- mgmt/trunk/cumin/python/cumin/brokerlink.py 2008-09-15 14:44:23 UTC (rev 2473) +++ mgmt/trunk/cumin/python/cumin/brokerlink.py 2008-09-15 15:58:02 UTC (rev 2474) @@ -378,10 +378,7 @@ return self.phase.path def render_exchanges(self, session, *args): - - #reg = self.frame.frame.frame.get_object(session) - broker = self.get_parent_named("broker") - reg = broker.get_object(session) + reg = self.frame.get_ancestor("broker").get_object(session) vhost = reg.getDefaultVhost() sortedExchanges = sorted_by(vhost.exchanges) @@ -665,4 +662,4 @@ bridge = Bridge.get(id) return "<td>%s</td><td>%s</td>" % (bridge.dest, bridge.key) - \ No newline at end of file + Modified: mgmt/trunk/cumin/python/wooly/__init__.py =================================================================== --- mgmt/trunk/cumin/python/wooly/__init__.py 2008-09-15 14:44:23 UTC (rev 2473) +++ mgmt/trunk/cumin/python/wooly/__init__.py 2008-09-15 15:58:02 UTC (rev 2474) @@ -164,6 +164,11 @@ self.parameters.append(parameter) parameter.widget = self + def get_ancestor(self, name): + for anc in reversed(self.ancestors): + if anc.name == name: + return anc + @classmethod def get_module_strings(cls): module = sys.modules[cls.__module__] Modified: mgmt/trunk/cumin/python/wooly/forms.py =================================================================== --- mgmt/trunk/cumin/python/wooly/forms.py 2008-09-15 14:44:23 UTC (rev 2473) +++ mgmt/trunk/cumin/python/wooly/forms.py 2008-09-15 15:58:02 UTC (rev 2474) @@ -295,13 +295,6 @@ if self.__errors.attr.get(session): return self.__errors.render(session) - def get_parent_named(self, name): - progenitor = self.parent - while progenitor: - if progenitor.path.endswith(name): - return progenitor - progenitor = progenitor.parent - class FormFieldErrors(ItemSet): def __init__(self, app, name): super(FormFieldErrors, self).__init__(app, name)