Changeset 1639

Timestamp:

07/10/08 13:56:52 (6 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/admin/PageVServer.py (modified) (3 diffs)
• cherokee/trunk/admin/config.py (modified) (2 diffs)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-07-10  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * admin/PageVServer.py: Adds support for renaming virtual
+        servers (its nickname, actually).
+
+        * admin/config.py: Adds two new methods: clone() and rename() for
+        handling tree pieces.
-
-        * admin/PageMain.py, admin/Table.py: The couple of tables in the

cherokee/trunk/admin/PageVServer.py

@@ -86 +86 @@
-            else:
-                # It's updating properties
-
+
+
-
-        elif uri.endswith('/ajax_update'):
@@ -172 +173 @@
-        # Basics
-        table = TableProps()
+        if host != "default":
+            self._cfg['tmp!vserver_name'] = host
+            self.AddPropEntry (table, 'Virtual Server nickname', 'tmp!vserver_name', "prueba")
-        self.AddPropEntry (table, 'Document Root',     '%s!document_root'%(pre),   NOTE_DOCUMENT_ROOT)
-        self.AddPropEntry (table, 'Directory Indexes', '%s!directory_index'%(pre), NOTE_DIRECTORY_INDEX)
@@ -450 +454 @@
-        pre = "vserver!%s" % (host)
-
+        # Vserver nickname change
+        name = post.get_val("tmp!vserver_name")
+        if name and name != host:
+            self._cfg.rename('vserver!%s'%(host), 'vserver!%s'%(name))
+            return '/vserver/'
+
-        # Error handler
-        self.ApplyChanges_OptionModule ('%s!error_handler'%(pre), uri, post)

cherokee/trunk/admin/config.py

@@ -7 +7 @@
-
-    # Value
+    #
-    def _get_value (self):
-        return self._val
@@ -182 +183 @@
-        return self.root[path]
-
+    def clone (self, path_old, path_new):
+        parent, parent_path, child_name = self._get_parent_node (path_old)
+        if self.root[path_new]:
+            return True
+        self.set_sub_node (path_new, self[path_old])
+    
+    def rename (self, path_old, path_new):
+        self.clone (path_old, path_new)
+        del(self[path_old])
+
-    def set_sub_node (self, path, config_node):
-        assert (isinstance(config_node, ConfigNode))