From c3e9a8bae861fed1f9c6643227f0753feaa15d60 Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Wed, 8 Oct 2014 13:56:17 +0200
Subject: [PATCH] Update fields, remove deprecated 'method' argument, change
 'states' otherwise the fields are not readonly (seems that the 'states' of
 the original field is kept.

---
 mail_environment/env_mail.py | 56 +++++++++++++++++++-----------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/mail_environment/env_mail.py b/mail_environment/env_mail.py
index d16f1963a..ab624053e 100644
--- a/mail_environment/env_mail.py
+++ b/mail_environment/env_mail.py
@@ -53,46 +53,49 @@ class IrMail(orm.Model):
     _columns = {
         'smtp_host': fields.function(
             _get_smtp_conf,
-            method=True,
             string='SMTP Server',
             type="char",
             multi='outgoing_mail_config',
-            size=128),
+            states={'draft': [('readonly', True)]},
+            help="Hostname or IP of SMTP server"),
         'smtp_port': fields.function(
             _get_smtp_conf,
-            method=True,
             string='SMTP Port',
             type="integer",
             multi='outgoing_mail_config',
+            states={'draft': [('readonly', True)]},
             help="SMTP Port. Usually 465 for SSL, and 25 or 587 for other cases.",
             size=5),
         'smtp_user': fields.function(
             _get_smtp_conf,
-            method=True,
             string='Username',
             type="char",
             multi='outgoing_mail_config',
+            states={'draft': [('readonly', True)]},
             help="Optional username for SMTP authentication",
             size=64),
         'smtp_pass': fields.function(
             _get_smtp_conf,
-            method=True,
             string='Password',
             type="char",
             multi='outgoing_mail_config',
+            states={'draft': [('readonly', True)]},
             help="Optional password for SMTP authentication",
             size=64),
         'smtp_encryption': fields.function(
             _get_smtp_conf,
-            method=True,
             string='smtp_encryption',
-            type="char",
+            type="selection",
             multi='outgoing_mail_config',
+            selection=[('none','None'),
+                       ('starttls','TLS (STARTTLS)'),
+                       ('ssl','SSL/TLS')],
+            states={'draft': [('readonly', True)]},
             help="Choose the connection encryption scheme:\n"
                  "- none: SMTP sessions are done in cleartext.\n"
                  "- starttls: TLS encryption is requested at start of SMTP session (Recommended)\n"
-                 "- ssl: SMTP sessions are encrypted with SSL/TLS through a dedicated port (default: 465)",
-            size=64)}
+                 "- ssl: SMTP sessions are encrypted with SSL/TLS through a dedicated port (default: 465)",)
+    }
 
 
 class FetchmailServer(orm.Model):
@@ -158,64 +161,65 @@ class FetchmailServer(orm.Model):
     _columns = {
         'server': fields.function(
             _get_incom_conf,
-            method=True,
             string='Server',
             type="char",
             multi='income_mail_config',
-            size=256, help="Hostname or IP of the mail server"),
+            states={'draft': [('readonly', True)]},
+            help="Hostname or IP of the mail server"),
         'port': fields.function(
             _get_incom_conf,
-            method=True,
             string='Port',
             type="integer",
-            multi='income_mail_config',
-            help="Hostname or IP of the mail server"),
+            states={'draft': [('readonly', True)]},
+            multi='income_mail_config'),
         'type': fields.function(
             _get_incom_conf,
-            method=True,
             string='Type',
-            type="char",
+            type="selection",
+            selection=[('pop', 'POP Server'),
+                       ('imap', 'IMAP Server'),
+                       ('local', 'Local Server'),
+                       ],
             multi='income_mail_config',
             fnct_search=_type_search,
-            size=64,
+            states={'draft': [('readonly', True)]},
             help="pop, imap, local"),
         'is_ssl': fields.function(
             _get_incom_conf,
-            method=True,
             string='Is SSL',
             type="boolean",
             multi='income_mail_config',
+            states={'draft': [('readonly', True)]},
             help='Connections are encrypted with SSL/TLS through'
                  ' a dedicated port (default: IMAPS=993, POP3S=995)'),
         'attach': fields.function(
             _get_incom_conf,
-            method=True,
             string='Keep Attachments',
             type="boolean",
             multi='income_mail_config',
+            states={'draft': [('readonly', True)]},
             help="Whether attachments should be downloaded. "
                  "If not enabled, incoming emails will be stripped of any "
                  "attachments before being processed"),
         'original': fields.function(
             _get_incom_conf,
-            method=True,
             string='Keep Original',
             type="boolean",
             multi='income_mail_config',
+            states={'draft': [('readonly', True)]},
             help="Whether a full original copy of each email should be kept "
                  "for reference and attached to each processed message. This "
                  "will usually double the size of your message database."),
         'user': fields.function(
             _get_incom_conf,
-            method=True,
             string='Username',
             type="char",
-            multi='income_mail_config',
-            size=64),
+            states={'draft': [('readonly', True)]},
+            multi='income_mail_config'),
         'password': fields.function(
             _get_incom_conf,
-            method=True,
             string='password',
             type="char",
-            multi='income_mail_config',
-            size=64)}
+            states={'draft': [('readonly', True)]},
+            multi='income_mail_config')
+    }