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

Author: justi9 Date: 2007-10-19 10:40:44 -0400 (Fri, 19 Oct 2007) New Revision: 1116 Modified: mgmt/cumin/python/cumin/page.py mgmt/cumin/python/cumin/page.strings mgmt/cumin/python/cumin/servergroup.py mgmt/cumin/python/cumin/servergroup.strings mgmt/cumin/python/cumin/widgets.py Log: Fills out server group forms after the change to the proposed layout. Modified: mgmt/cumin/python/cumin/page.py =================================================================== --- mgmt/cumin/python/cumin/page.py 2007-10-19 13:43:30 UTC (rev 1115) +++ mgmt/cumin/python/cumin/page.py 2007-10-19 14:40:44 UTC (rev 1116) @@ -37,9 +37,6 @@ self.group_add = ServerGroupAdd(app, "groupadd") self.add_mode(self.group_add) - self.group_edit = ServerGroupEdit(app, "groupedit") - self.add_mode(self.group_edit) - self.profile = ServerProfileFrame(app, "profile") self.add_mode(self.profile) @@ -77,31 +74,26 @@ frame = self.show_mode(session, self.server) frame.set_object(session, server) - return self.page().set_current_frame(session, frame) + return self.set_current_frame(session, frame) def show_server_group(self, session, group): frame = self.show_mode(session, self.group) frame.set_object(session, group) - return self.page().set_current_frame(session, frame) + return self.set_current_frame(session, frame) def show_server_group_add(self, session): frame = self.show_mode(session, self.group_add) - return self.page().set_current_frame(session, frame) + return self.set_current_frame(session, frame) - def show_server_group_edit(self, session, group): - frame = self.show_mode(session, self.group_edit) - frame.set_object(session, group) - return self.page().set_current_frame(session, frame) - def show_cluster(self, session, cluster): frame = self.show_mode(session, self.cluster) frame.set_object(session, cluster) - return self.page().set_current_frame(session, frame) + return self.set_current_frame(session, frame) def show_server_profile(self, session, profile): frame = self.show_mode(session, self.profile) frame.set_object(session, profile) - return self.page().set_current_frame(session, frame) + return self.set_current_frame(session, frame) def show_virtual_host(self, session, vhost): server = vhost.get_server() @@ -116,7 +108,7 @@ frame = frame.show_virtual_host(session, vhost) - return self.page().set_current_frame(session, frame) + return self.set_current_frame(session, frame) def show_queue(self, session, queue): frame = self.show_virtual_host(session, queue.virtual_host) @@ -186,6 +178,11 @@ def render_title(self, session, model): return "Server Groups (%i)" % len(model.get_server_groups()) + def render_group_add_href(self, session, model): + branch = session.branch() + self.page().show_server_group_add(branch) + return branch.marshal() + class ServerProfileTab(ServerProfileSet): def render_title(self, session, model): return "Server Profiles (%i)" % len(model.get_server_profiles()) Modified: mgmt/cumin/python/cumin/page.strings =================================================================== --- mgmt/cumin/python/cumin/page.strings 2007-10-19 13:43:30 UTC (rev 1115) +++ mgmt/cumin/python/cumin/page.strings 2007-10-19 14:40:44 UTC (rev 1116) @@ -253,6 +253,10 @@ background-color: #564979; } +form.mform .head h1 { + margin: 0; +} + form.mform .foot { text-align: right; border-top: 1px solid #ddd; @@ -429,7 +433,7 @@ [ServerGroupTab.html] <ul class="actions"> - <li><a href="">Add Server Group</a></li> + <li><a href="{group_add_href}">Add Server Group</a></li> </ul> <table class="mobjects"> Modified: mgmt/cumin/python/cumin/servergroup.py =================================================================== --- mgmt/cumin/python/cumin/servergroup.py 2007-10-19 13:43:30 UTC (rev 1115) +++ mgmt/cumin/python/cumin/servergroup.py 2007-10-19 14:40:44 UTC (rev 1116) @@ -1,6 +1,7 @@ from wooly import * from wooly.widgets import * +from model import * from widgets import * from parameters import * from util import * @@ -35,19 +36,15 @@ self.view = ServerGroupView(app, "view") self.add_child(self.view) + self.set_view_mode(self.view) self.edit = ServerGroupEdit(app, "edit") self.add_child(self.edit) + self.set_edit_mode(self.edit) - def show_view(self, session): - return self.show_mode(session, self.view) - def render_title(self, session, group): return "Server Group '%s'" % group.name - def render_href(self, session, group): - return self.page().server_group_href(session, group) - class ServerGroupView(Widget): def __init__(self, app, name): super(ServerGroupView, self).__init__(app, name) @@ -66,6 +63,11 @@ def render_category(self, session, group): return group.get_type().name + def render_edit_href(self, session, group): + branch = session.branch() + self.page().show_server_group(branch, group).show_edit(branch) + return branch.marshal() + class GroupServerTab(Widget): def render_title(self, session, group): return "Servers (%i)" % len(group.server_items()) @@ -77,12 +79,7 @@ self.group_name = TextInput(app, "name", self) self.add_child(self.group_name) - def process_submit(self, session, object): - if object is self.app.model: - group = ServerGroup(object) - else: - group = object - + def process_group(self, session, group): group.lock() try: group.name = self.group_name.get(session) @@ -91,31 +88,31 @@ group.unlock() branch = session.branch() - self.page().show_server_group(branch, group) + self.page().show_server_group(branch, group).show_view(branch) session.set_redirect(branch.marshal()) +class ServerGroupAdd(ServerGroupForm, Frame): def process_cancel(self, session, model): branch = session.branch() self.page().show_view(branch) session.set_redirect(branch.marshal()) - -class ServerGroupAdd(ServerGroupForm, Frame): + + def process_submit(self, session, model): + group = ServerGroup(model) + self.process_group(session, group) + def render_title(self, session, model): return "Add Group" class ServerGroupEdit(ServerGroupForm, Frame): - def __init__(self, app, name): - super(ServerGroupEdit, self).__init__(app, name) + def process_cancel(self, session, group): + branch = session.branch() + self.parent.show_view(branch) + session.set_redirect(branch.marshal()) - self.param = ServerGroupParameter(app, "id") - self.add_parameter(self.param) - - def get_object(self, session, object): - return self.param.get(session) + def process_submit(self, session, group): + self.process_group(session, group) - def set_object(self, session, group): - self.param.set(session, group) - def process_display(self, session, group): self.group_name.set(session, group.name) Modified: mgmt/cumin/python/cumin/servergroup.strings =================================================================== --- mgmt/cumin/python/cumin/servergroup.strings 2007-10-19 13:43:30 UTC (rev 1115) +++ mgmt/cumin/python/cumin/servergroup.strings 2007-10-19 14:40:44 UTC (rev 1116) @@ -31,7 +31,7 @@ </dl> <ul class="actions"> - <li><a href="">Edit This Server Group</a></li> + <li><a href="{edit_href}">Edit This Server Group</a></li> <li><a href="">Remove This Server Group</a></li> </ul> Modified: mgmt/cumin/python/cumin/widgets.py =================================================================== --- mgmt/cumin/python/cumin/widgets.py 2007-10-19 13:43:30 UTC (rev 1115) +++ mgmt/cumin/python/cumin/widgets.py 2007-10-19 14:40:44 UTC (rev 1116) @@ -19,6 +19,8 @@ super(CuminFrame, self).__init__(app, name) self.__param = None + self.__view_mode = None + self.__edit_mode = None def set_object_parameter(self, param): self.__param = param @@ -29,15 +31,24 @@ def set_object(self, session, object): return self.__param.set(session, object) + def set_view_mode(self, mode): + self.__view_mode = mode + def show_view(self, session): - pass + self.show_mode(session, self.__view_mode) + def set_edit_mode(self, mode): + self.__edit_mode = mode + + def show_edit(self, session): + self.show_mode(session, self.__edit_mode) + def do_process(self, session, object): self.page().get_frames(session).append(self) super(CuminFrame, self).do_process(session, object) - def render_href(self, session, vhost): + def render_href(self, session, object): branch = session.branch() self.page().set_current_frame(branch, self) self.show_view(branch)