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

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2008-08-07 15:42:49 -0400 (Thu, 07 Aug 2008)
New Revision: 2262

Modified:
   mgmt/trunk/cumin/python/cumin/binding.py
   mgmt/trunk/cumin/python/cumin/binding.strings
   mgmt/trunk/cumin/python/cumin/broker.py
   mgmt/trunk/cumin/python/cumin/broker.strings
Log:
Added Active/All state to exchange bindings

Modified: mgmt/trunk/cumin/python/cumin/binding.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/binding.py	2008-08-07 17:54:00 UTC (rev 2261)
+++ mgmt/trunk/cumin/python/cumin/binding.py	2008-08-07 19:42:49 UTC (rev 2262)
@@ -1,5 +1,6 @@
 from cumin.exchange import ExchangeInfo
 from cumin.util import sorted_by, is_active
+from cumin.widgets import StateSwitch
 from formats import fmt_shorten
 from wooly import Template, Writer, Attribute
 from wooly.forms import FormInput, FormField
@@ -199,13 +200,27 @@
     def render_headers_extra(self, session, exchange):
         return "headers_extra.%s" % str(exchange.id)
     
+class ExchangeState(StateSwitch):
+    def __init__(self, app, name):
+        super(ExchangeState, self).__init__(app, name)
 
+        self.add_state("c", "Active")
+        self.add_state("a", "All")
+   
+    def render_href(self, session):
+        pass
+         
+    def is_all(self, session):
+        return self.get(session) == "a"
 
+    def is_active(self, session):
+        return self.get(session) == "c"
+
 class ExchangeKeysField(FormField):
     def __init__(self, app, name, form, title="Initial bindings:"):
         super(ExchangeKeysField, self).__init__(app, name, form)
 
-        self.dict_param = DictParameter(app, "exchange", form)
+        self.dict_param = DictParameter(app, "exchange")
         self.add_parameter(self.dict_param)
         form.add_form_parameter(self.dict_param)
 
@@ -229,6 +244,9 @@
         self.binding_errors = self.Errors(self, "binding_errors")
         self.add_attribute(self.binding_errors)
 
+        self.__state = ExchangeState(app, "phase")
+        self.add_child(self.__state)
+
     def get_args(self, session):
         broker = self.get_parent_named("broker")
         reg = broker.get_object(session)
@@ -247,7 +265,8 @@
         # render each exchange we support
         writer = Writer()
         for exchange in sortedExchanges:
-            if ExchangeInfo.is_builtin(exchange) or is_active(exchange):
+            if ExchangeInfo.is_builtin(exchange) or \
+                not (self.__state.is_active(session) and not is_active(exchange)):
                 # instance_key gives us a unique path for each exchange
                 # we will be rendering
                 instance_key = self.dict_param.get_instance_key(str(exchange.id))

Modified: mgmt/trunk/cumin/python/cumin/binding.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/binding.strings	2008-08-07 17:54:00 UTC (rev 2261)
+++ mgmt/trunk/cumin/python/cumin/binding.strings	2008-08-07 19:42:49 UTC (rev 2262)
@@ -135,7 +135,9 @@
 
 [ExchangeKeysField.html]
 <div class="field">
+  <div class="rfloat">{phase}</div>
   <div class="title">{title}</div>
+  <div class="rclear">&nbsp;</div>
   
 <div class="inputs">
 <table class="mobjects" id="exchange_types">
@@ -149,6 +151,7 @@
   <tbody>
   {exchanges}
   </tbody>
+  
 </table>
 </div>
 </div>

Modified: mgmt/trunk/cumin/python/cumin/broker.py
===================================================================
--- mgmt/trunk/cumin/python/cumin/broker.py	2008-08-07 17:54:00 UTC (rev 2261)
+++ mgmt/trunk/cumin/python/cumin/broker.py	2008-08-07 19:42:49 UTC (rev 2262)
@@ -191,6 +191,7 @@
         return self.show_mode(session, self.__queues_remove)
     
     def show_queue_add(self, session):
+        self.page.set_current_frame(session, self.__queue_add)
         return self.show_mode(session, self.__queue_add) 
 
     def show_exchange(self, session, exchange):
@@ -573,6 +574,9 @@
     class MoreEntries(FormButton):
         def render_content(self, session):
             return "More Entries"
+        
+        def render_class(self, session):
+            return "more"
 
 class BrokerSetAdd(BrokerSetForm):
     def process_cancel(self, session):

Modified: mgmt/trunk/cumin/python/cumin/broker.strings
===================================================================
--- mgmt/trunk/cumin/python/cumin/broker.strings	2008-08-07 17:54:00 UTC (rev 2261)
+++ mgmt/trunk/cumin/python/cumin/broker.strings	2008-08-07 19:42:49 UTC (rev 2262)
@@ -191,7 +191,7 @@
     {hidden_inputs}
   </div>
   <div class="foot">
-    <a class="help action" href="{href}" target="help">Help</a>
+    {help}
     {submit}
     {cancel}
   </div>