[rhmessaging-commits] rhmessaging commits: r2744 - mgmt/trunk/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2008-11-05 16:30:05 -0500 (Wed, 05 Nov 2008)
New Revision: 2744

Modified:
   mgmt/trunk/cumin/python/cumin/binding.py
   mgmt/trunk/cumin/python/cumin/binding.strings
Log:
Fixed All/Active radio buttons on queue binding form.

Modified: mgmt/trunk/cumin/python/cumin/binding.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/binding.py	2008-11-05 20:41:02 UTC (rev 2743)
+++ mgmt/trunk/cumin/python/cumin/binding.py	2008-11-05 21:30:05 UTC (rev 2744)
@@ -246,7 +246,7 @@
    
     def render_item_link(self, session, state):
         path = state == "a" and "state_all" or "state_active"
-        return super(ExchangeState, self).render_item_link(session, state, id=path)
+        return super(ExchangeState, self).render_item_link(session, state, id=path, bm="phase")
 
     def is_all(self, session):
         return self.get(session) == "a"
@@ -261,9 +261,6 @@
         self.dict_param = DictParameter(app, "exchange")
         self.add_parameter(self.dict_param)
         
-        self.phase = self.PhaseParameter(app, "phase")
-        self.add_parameter(self.phase)
-
         self.direct_input = DirectExchangeInput(app, "direct")
         self.add_child(self.direct_input)
 
@@ -287,9 +284,6 @@
         self.state = ExchangeState(app, "phase")
         self.add_child(self.state)
 
-    def render_phase_path(self, session, vhost):
-        return self.phase.path
-    
     def get_args(self, session):
         reg = self.frame.get_ancestor("broker").get_object(session)
         return (reg.getDefaultVhost(),)
@@ -298,10 +292,6 @@
         def get_default(self, session):
             return dict()
 
-    class PhaseParameter(Parameter):
-        def get_default(self, session):
-            return ""
-        
     def render_title(self, session, vhost):
         return self.title
     
@@ -336,12 +326,6 @@
         
         return writer.to_string()
     
-    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):
 
         form_binding_info = self.process_binding_info(session, queue_name)

Modified: mgmt/trunk/cumin/python/cumin/binding.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/binding.strings	2008-11-05 20:41:02 UTC (rev 2743)
+++ mgmt/trunk/cumin/python/cumin/binding.strings	2008-11-05 21:30:05 UTC (rev 2744)
@@ -132,25 +132,9 @@
 		
 	headers_extra.style.display = display;
 }
-function toggle_phase(state) {
-	var phase_state = document.getElementById("phase_state")
-	if (phase_state) {
-		phase_state.value = state;
-		document.forms[0].submit()
-	}
-	return false;
-}
-function attachPhase() {
-	if (document.getElementById("state_all"))
-		document.getElementById("state_all").onclick = function() { return toggle_phase("a") }
-	if (document.getElementById("state_active"))
-		document.getElementById("state_active").onclick = function() { return toggle_phase("c") }
-}
-addEvent(window, "load", attachPhase);
 
 [ExchangeKeysField.html]
-<div class="field">
-  <input id="phase_state" type="hidden" name="{phase_path}" value="" />
+<div class="field"><a name="phase"></a>
   <div class="rfloat">{phase}</div>
   <div class="title">{title}</div>
   <div class="rclear">&nbsp;</div>