[rhmessaging-commits] rhmessaging commits: r2477 - in mgmt/trunk/cumin/python: wooly and 1 other directory.

Author: eallen Date: 2008-09-16 10:27:20 -0400 (Tue, 16 Sep 2008) New Revision: 2477 Modified: mgmt/trunk/cumin/python/cumin/binding.py mgmt/trunk/cumin/python/cumin/brokerlink.py mgmt/trunk/cumin/python/cumin/exchange.py mgmt/trunk/cumin/python/cumin/job.py mgmt/trunk/cumin/python/cumin/queue.py mgmt/trunk/cumin/python/cumin/scheduler.py mgmt/trunk/cumin/python/cumin/submitter.py mgmt/trunk/cumin/python/cumin/widgets.py mgmt/trunk/cumin/python/wooly/__init__.py Log: Removed pre_render and pre_process methods Modified: mgmt/trunk/cumin/python/cumin/binding.py =================================================================== --- mgmt/trunk/cumin/python/cumin/binding.py 2008-09-15 19:24:38 UTC (rev 2476) +++ mgmt/trunk/cumin/python/cumin/binding.py 2008-09-16 14:27:20 UTC (rev 2477) @@ -325,10 +325,11 @@ return writer.to_string() - def pre_process(self, session): + def render(self, session, *args): phase = self.phase.get(session) if phase: self.state.set(session, phase) + return super(ExchangeKeysField, self).render(session, *args) def get_binding_errors(self, session, queue_name): Modified: mgmt/trunk/cumin/python/cumin/brokerlink.py =================================================================== --- mgmt/trunk/cumin/python/cumin/brokerlink.py 2008-09-15 19:24:38 UTC (rev 2476) +++ mgmt/trunk/cumin/python/cumin/brokerlink.py 2008-09-16 14:27:20 UTC (rev 2477) @@ -393,10 +393,11 @@ return writer.to_string() - def pre_process(self, session, *args): + def render(self, session, *args): phase = self.phase.get(session) if phase: self.state.set(session, phase) + return super(ExchangeRadioField, self).render(session, *args) class BridgeAdd(CuminFieldForm): def __init__(self, app, name): @@ -446,8 +447,7 @@ def render_title(self, session, link): return "Add Route to '%s:%d'" % (link.host, link.port) - def pre_process(self, session, *args): - self.exchange.pre_process(session, *args) + def process_display(self, session, *args): if not self.tag.get(session): self.tag.set(session, args[0].managedBroker) Modified: mgmt/trunk/cumin/python/cumin/exchange.py =================================================================== --- mgmt/trunk/cumin/python/cumin/exchange.py 2008-09-15 19:24:38 UTC (rev 2476) +++ mgmt/trunk/cumin/python/cumin/exchange.py 2008-09-16 14:27:20 UTC (rev 2477) @@ -308,9 +308,10 @@ self.set_default_column_name("q_id") - def pre_render(self, session, args): + def do_process(self, session, *args): self.show_column(session, "q_id") - + return super(ExchangeBindingSet, self).do_process(session, *args) + def render_title(self, session, exchange): return "Queue Bindings %s" % \ fmt_count(exchange.bindings.count()) Modified: mgmt/trunk/cumin/python/cumin/job.py =================================================================== --- mgmt/trunk/cumin/python/cumin/job.py 2008-09-15 19:24:38 UTC (rev 2476) +++ mgmt/trunk/cumin/python/cumin/job.py 2008-09-16 14:27:20 UTC (rev 2477) @@ -286,12 +286,13 @@ self.__release = JobReleaseButton(app, "release", self) self.add_child(self.__release) - def pre_render(self, session, args): + def do_process(self, session, *args): self.show_column(session, "global_job_id") self.show_column(session, "cmd") #self.show_column(session, "submitter") self.show_column(session, "job_status") self.show_column(session, "scheduler") + super(JobGroupJobSet, self).do_process(session, *args) def render_title(self, session, group): where_group = "custom_group = '%s'" % group.get_id() @@ -748,7 +749,7 @@ self.__release = JobReleaseButton(app, "release", self) self.add_child(self.__release) - def pre_render(self, session, args): + def do_process(self, session, *args): self.show_column(session, "global_job_id") self.show_column(session, "custom_id") self.show_column(session, "cmd") @@ -756,6 +757,7 @@ self.show_column(session, "scheduler") self.show_column(session, "submitter") self.show_column(session, "job_status") + super(JobTab, self).do_process(session, *args) def render_sql_where(self, session, *args): phase_sql = self.get_phase_sql(session) Modified: mgmt/trunk/cumin/python/cumin/queue.py =================================================================== --- mgmt/trunk/cumin/python/cumin/queue.py 2008-09-15 19:24:38 UTC (rev 2476) +++ mgmt/trunk/cumin/python/cumin/queue.py 2008-09-16 14:27:20 UTC (rev 2477) @@ -289,8 +289,9 @@ self.set_default_column_name("e_id") - def pre_render(self, session, args): + def do_process(self, session, *args): self.show_column(session, "e_id") + super(QueueBindingSet, self).do_process(session, *args) def render_add_queue_binding_url(self, session, vhost): branch = session.branch() @@ -340,9 +341,6 @@ self.bindings = ExchangeKeysField(app, "bindings", self) self.add_field(self.bindings) - def pre_process(self, session): - self.bindings.pre_process(session) - def validate(self, session, queue_name): super_error = super(QueueForm, self).validate(session) (errors, form_binding_info) = self.bindings.get_binding_errors(session, queue_name) @@ -526,9 +524,6 @@ return "<ul class=\"errors\" style=\"margin:0; float:left;\"><li>%s</li></ul>" % \ "</li><li>".join(errors["no_exchanges"]) - def pre_process(self, session): - self.bindings.pre_process(session) - def process_submit(self, session): queue = self.frame.get_object(session) (errors, form_binding_info) = self.bindings.get_binding_errors(session, queue.name) Modified: mgmt/trunk/cumin/python/cumin/scheduler.py =================================================================== --- mgmt/trunk/cumin/python/cumin/scheduler.py 2008-09-15 19:24:38 UTC (rev 2476) +++ mgmt/trunk/cumin/python/cumin/scheduler.py 2008-09-16 14:27:20 UTC (rev 2477) @@ -141,13 +141,14 @@ self.__release = JobReleaseButton(app, "release", self) self.add_child(self.__release) - def pre_render(self, session, args): + def do_process(self, session, *args): self.show_column(session, "global_job_id") self.show_column(session, "custom_id") self.show_column(session, "cmd") self.show_column(session, "submitter") self.show_column(session, "custom_group") self.show_column(session, "job_status") + super(SchedulerJobSet, self).do_process(session, *args) def render_sql_where(self, session, scheduler): phase_sql = self.get_phase_sql(session) Modified: mgmt/trunk/cumin/python/cumin/submitter.py =================================================================== --- mgmt/trunk/cumin/python/cumin/submitter.py 2008-09-15 19:24:38 UTC (rev 2476) +++ mgmt/trunk/cumin/python/cumin/submitter.py 2008-09-16 14:27:20 UTC (rev 2477) @@ -132,13 +132,14 @@ self.__release = JobReleaseButton(app, "release", self) self.add_child(self.__release) - def pre_render(self, session, args): + def do_process(self, session, *args): self.show_column(session, "global_job_id") self.show_column(session, "custom_id") self.show_column(session, "cmd") self.show_column(session, "scheduler") self.show_column(session, "custom_group") self.show_column(session, "job_status") + super(SubmitterJobSet, self).do_process(session, *args) def render_sql_where(self, session, submitter): phase_sql = self.get_phase_sql(session) Modified: mgmt/trunk/cumin/python/cumin/widgets.py =================================================================== --- mgmt/trunk/cumin/python/cumin/widgets.py 2008-09-15 19:24:38 UTC (rev 2476) +++ mgmt/trunk/cumin/python/cumin/widgets.py 2008-09-16 14:27:20 UTC (rev 2477) @@ -152,8 +152,6 @@ def do_process(self, session, *args): self.page.set_modal(session, self.get_modal(session)) - self.pre_process(session, *args) - if self.__cancel.get(session): self.__cancel.set(session, False) @@ -179,9 +177,6 @@ def post_process(self, session, *args): pass - def pre_process(self, session, *args): - pass - def render_cancel_content(self, session, *args): return "Cancel" Modified: mgmt/trunk/cumin/python/wooly/__init__.py =================================================================== --- mgmt/trunk/cumin/python/wooly/__init__.py 2008-09-15 19:24:38 UTC (rev 2476) +++ mgmt/trunk/cumin/python/wooly/__init__.py 2008-09-16 14:27:20 UTC (rev 2477) @@ -232,11 +232,7 @@ return string - def pre_render(self, session, *args): - pass - def do_render(self, session, *args): - self.pre_render(session, *args) writer = Writer() self.__main_tmpl.render(writer, session, *args) return writer.to_string()