From 5930078ec7a33c923d16ba0a313d47b18ad6f7d6 Mon Sep 17 00:00:00 2001
From: Fabio Tranchitella <kobold@debian.org>
Date: Wed, 9 Apr 2008 09:47:45 +0000
Subject: [PATCH] Add the encoding property into the ZMI add form (debian bug
 #475123).

---
 ZPsycopgDA/DA.py         |  4 ++--
 ZPsycopgDA/dtml/add.dtml | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ZPsycopgDA/DA.py b/ZPsycopgDA/DA.py
index a80f9fde..05bb6f08 100644
--- a/ZPsycopgDA/DA.py
+++ b/ZPsycopgDA/DA.py
@@ -57,10 +57,10 @@ manage_addZPsycopgConnectionForm = HTMLFile('dtml/add',globals())
 
 def manage_addZPsycopgConnection(self, id, title, connection_string,
                                  zdatetime=None, tilevel=2,
-                                 check=None, REQUEST=None):
+                                 encoding='', check=None, REQUEST=None):
     """Add a DB connection to a folder."""
     self._setObject(id, Connection(id, title, connection_string,
-                                   zdatetime, check, tilevel))
+                                   zdatetime, check, tilevel, encoding))
     if REQUEST is not None: return self.manage_main(self, REQUEST)
 
 
diff --git a/ZPsycopgDA/dtml/add.dtml b/ZPsycopgDA/dtml/add.dtml
index c718ded6..54650665 100644
--- a/ZPsycopgDA/dtml/add.dtml
+++ b/ZPsycopgDA/dtml/add.dtml
@@ -83,6 +83,16 @@ or DSN for short) is a string... (TODO: finish docs)
       </select>
     </td>
   </tr>
+  <tr>
+    <td align="left" valign="top">
+    <div class="form-label">
+    Encoding
+    </div>
+    </td>
+    <td align="left" valign="top">
+    <input type="text" name="encoding" size="40" value="" />
+    </td>
+  </tr>
   <tr>
     <td align="left" valign="top" colspan="2">
     <div class="form-element">