[rhmessaging-commits] rhmessaging commits: r1647 - mgmt/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2008-02-06 14:27:44 -0500 (Wed, 06 Feb 2008)
New Revision: 1647

Modified:
   mgmt/cumin/python/cumin/brokergroup.py
   mgmt/cumin/python/cumin/page.py
   mgmt/cumin/python/cumin/widgets.py
Log:
Move broker group add to the broker group frame.

Make the messaging tab selected by default.



Modified: mgmt/cumin/python/cumin/brokergroup.py
===================================================================
--- mgmt/cumin/python/cumin/brokergroup.py	2008-02-06 17:04:54 UTC (rev 1646)
+++ mgmt/cumin/python/cumin/brokergroup.py	2008-02-06 19:27:44 UTC (rev 1647)
@@ -25,7 +25,7 @@
 
     def render_group_add_href(self, session, model):
         branch = session.branch()
-        self.frame().show_broker_group_add(branch)
+        self.frame().show_broker_group(branch, None).show_add(branch)
         return branch.marshal()
 
     class NameColumn(SqlTableColumn):
@@ -42,25 +42,34 @@
     def __init__(self, app, name):
         super(BrokerGroupFrame, self).__init__(app, name)
 
-        self.param = BrokerGroupParameter(app, "id")
-        self.add_parameter(self.param)
-        self.set_object_parameter(self.param)
+        param = BrokerGroupParameter(app, "id")
+        self.add_parameter(param)
+        self.set_object_parameter(param)
 
-        self.view = BrokerGroupView(app, "view")
-        self.add_child(self.view)
-        self.set_view_mode(self.view)
+        view = BrokerGroupView(app, "view")
+        self.add_child(view)
+        self.set_view_mode(view)
 
-        self.edit = BrokerGroupEdit(app, "edit")
-        self.add_child(self.edit)
-        self.set_edit_mode(self.edit)
+        add = BrokerGroupAdd(app, "add")
+        self.add_child(add)
+        self.set_add_mode(add)
 
-        self.remove = BrokerGroupRemove(app, "remove")
-        self.add_child(self.remove)
-        self.set_remove_mode(self.remove)
+        edit = BrokerGroupEdit(app, "edit")
+        self.add_child(edit)
+        self.set_edit_mode(edit)
 
+        remove = BrokerGroupRemove(app, "remove")
+        self.add_child(remove)
+        self.set_remove_mode(remove)
+
     def get_title(self, session, group):
-        return "Broker Group '%s'" % group.name
+        if group:
+            title = "Broker Group '%s'" % group.name
+        else:
+            title = "Broker Group"
 
+        return title
+
 class BrokerGroupStatus(CuminStatus):
     pass
 
@@ -108,8 +117,9 @@
 
     def process_cancel(self, session, model):
         branch = session.branch()
-        self.frame().show_view(branch)
+        self.frame().frame().show_view(branch)
         self.page().pop_current_frame(branch)
+        self.page().pop_current_frame(branch)
         self.page().set_redirect_url(session, branch.marshal())
     
     def process_submit(self, session, model):

Modified: mgmt/cumin/python/cumin/page.py
===================================================================
--- mgmt/cumin/python/cumin/page.py	2008-02-06 17:04:54 UTC (rev 1646)
+++ mgmt/cumin/python/cumin/page.py	2008-02-06 19:27:44 UTC (rev 1647)
@@ -84,9 +84,6 @@
         self.__group = BrokerGroupFrame(app, "group")
         self.add_mode(self.__group)
 
-        self.__group_add = BrokerGroupAdd(app, "groupadd")
-        self.add_mode(self.__group_add)
-
         self.__profile = BrokerProfileFrame(app, "profile")
         self.add_mode(self.__profile)
 
@@ -155,10 +152,6 @@
         frame.set_object(session, group)
         return self.page().set_current_frame(session, frame)
 
-    def show_broker_group_add(self, session):
-        frame = self.show_mode(session, self.__group_add)
-        return self.page().set_current_frame(session, frame)
-
     def show_broker_profile(self, session, profile):
         frame = self.show_mode(session, self.__profile)
         frame.set_object(session, profile)
@@ -184,6 +177,7 @@
         self.html_class = "tabs"
 
         self.selection = Parameter(app, "sel")
+        self.selection.default = "mtab"
         self.add_parameter(self.selection)
 
         self.add_link(self.MessagingTab(app, "mtab"))

Modified: mgmt/cumin/python/cumin/widgets.py
===================================================================
--- mgmt/cumin/python/cumin/widgets.py	2008-02-06 17:04:54 UTC (rev 1646)
+++ mgmt/cumin/python/cumin/widgets.py	2008-02-06 19:27:44 UTC (rev 1647)
@@ -20,6 +20,7 @@
 
         self.__param = None
         self.__view = None
+        self.__add = None
         self.__edit = None
         self.__remove = None
 
@@ -39,23 +40,27 @@
     def show_view(self, session):
         return self.show_mode(session, self.__view)
 
+    def set_add_mode(self, mode):
+        self.__add = mode
+
+    def show_add(self, session):
+        return self.show_frame_mode(session, self.__add)
+
     def set_edit_mode(self, mode):
         self.__edit = mode
 
     def show_edit(self, session):
-        mode = self.show_mode(session, self.__edit)
+        return self.show_frame_mode(session, self.__edit)
 
-        if isinstance(mode, Frame):
-            self.page().set_current_frame(session, mode)
-
-        return mode
-
     def set_remove_mode(self, mode):
         self.__remove = mode
 
     def show_remove(self, session):
-        mode = self.show_mode(session, self.__remove)
+        return self.show_frame_mode(session, self.__remove)
 
+    def show_frame_mode(self, session, mode):
+        self.show_mode(session, mode)
+
         if isinstance(mode, Frame):
             self.page().set_current_frame(session, mode)