[MERGE] forward port of branch saas-2 up to revid 9195 chs@openerp.com-20140220154517-6y531n1mqtnfnsmr

bzr revid: chs@openerp.com-20140220163815-69sza1kclnh5mavs

1 files changed, 12 insertions, 4 deletions

diff --git a/addons/website_mail/models/mail_message.py b/addons/website_mail/models/mail_message.py
index 308cf9da4b8..c708d9c3e33 100644
--- a/addons/website_mail/models/mail_message.py
+++ b/addons/website_mail/models/mail_message.py
@@ -28,13 +28,21 @@ class MailMessage(osv.Model):
 
     _columns = {
         'website_published': fields.boolean(
-            'Publish', help="Publish on the website as a blog"
+            'Published', help="Visible on the website as a comment"
         ),
     }
 
-    _defaults = {
-        'website_published': True,
-    }
+    def default_get(self, cr, uid, fields_list, context=None):
+        defaults = super(MailMessage, self).default_get(cr, uid, fields_list, context=context)
+
+        # Note: explicitly implemented in default_get() instead of _defaults,
+        # to avoid setting to True for all existing messages during upgrades.
+        # TODO: this default should probably be dynamic according to the model
+        # on which the messages are attached, thus moved to create().
+        if 'website_published' in fields_list:
+            defaults.setdefault('website_published', True)
+
+        return defaults
 
     def _search(self, cr, uid, args, offset=0, limit=None, order=None,
                 context=None, count=False, access_rights_uid=None):