From 75b1ab7ac7c5d0f5509defc842cb9979f8263b4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@openerp.com>
Date: Mon, 26 Mar 2012 15:38:52 +0200
Subject: [PATCH] [ADD] res.users: added choice to send emails when receiving
 notifications on user form and preferences form. Also udpated res.users
 views.

bzr revid: tde@openerp.com-20120326133852-uumyi34kkbqbsl09
---
 addons/mail/__openerp__.py     |  1 +
 addons/mail/res_users.py       | 32 ++++++++++++++++++++++++++++-
 addons/mail/res_users_view.xml | 37 ++++++++++++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 addons/mail/res_users_view.xml

diff --git a/addons/mail/__openerp__.py b/addons/mail/__openerp__.py
index 9596804b114..d0be7392c77 100644
--- a/addons/mail/__openerp__.py
+++ b/addons/mail/__openerp__.py
@@ -64,6 +64,7 @@ The main features are:
         "res_partner_view.xml",
         'security/ir.model.access.csv',
         'mail_data.xml',
+        'res_users_view.xml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py
index 1c650ab1a34..574ae10c4d0 100644
--- a/addons/mail/res_users.py
+++ b/addons/mail/res_users.py
@@ -19,15 +19,45 @@
 #
 ##############################################################################
 
-from osv import osv
+from osv import osv, fields
+from tools.translate import _
 
 class res_users(osv.osv):
+    '''Update of res.users class
+    - add a preference about sending emails about notificatoins
+    - make a new user follow itself
+    '''
     _name = 'res.users'
     _inherit = ['res.users', 'mail.thread']
     
+    _columns = {
+        'message_email_pref': fields.selection([
+                        ('all', 'Everytime'),
+                        ('comments', 'Only for comments'),
+                        ('me', 'Only when sent directly to me'),
+                        ('none', 'Never'),
+                        ], 'New feeds email', help="Choose whether you want to receive an email when you receive new feeds."),
+    }
+    
+    _default = {
+        'message_email_pref': 'all',
+    }
+    
     def create(self, cr, uid, data, context=None):
         user_id = super(res_users, self).create(cr, uid, data, context=context)
         # make user follow itself
         self.message_subscribe(cr, uid, [user_id], [user_id], context=context)
         return user_id
 
+    #def message_load_ids(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[False], context=None):
+        #if context is None:
+            #context = {}
+        #msg_obj = self.pool.get('mail.message')
+        #msg_ids = msg_obj.search(cr, uid, ['&', ('res_id', 'in', ids), ('model', '=', self._name)] + domain,
+            #limit=limit, offset=offset, context=context)
+        #if (ascent): msg_ids = self._message_get_parent_ids(cr, uid, ids, msg_ids, root_ids, context=context)
+        #return msg_ids
+        
+    #def message_load(self, cr, uid, ids, limit=100, offset=0, domain=[], ascent=False, root_ids=[False], context=None):
+        #msg_ids = self.message_load_ids(cr, uid, ids, limit, offset, domain, ascent, root_ids, context=context)
+        #return self.pool.get('mail.message').read(cr, uid, msg_ids, context=context)
diff --git a/addons/mail/res_users_view.xml b/addons/mail/res_users_view.xml
new file mode 100644
index 00000000000..d359fdb7d34
--- /dev/null
+++ b/addons/mail/res_users_view.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+
+        <!-- Update Preferences form !-->
+        <record id="view_users_form_simple_modif_mail" model="ir.ui.view">
+            <field name="name">res.users.preferences.form.mail</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="/form/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
+                    <field name="message_email_pref"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
+
+        <!-- Update user form !-->
+        <record id="view_users_form_mail" model="ir.ui.view">
+            <field name="name">res.users.form.mail</field>
+            <field name="model">res.users</field>
+            <field name="inherit_id" ref="base.view_users_form"/>
+            <field name="arch" type="xml">
+            <data>
+                <xpath expr="/form/notebook/page[@string='User']/group/group/group[@name='preferences']/field[@name='menu_tips']" position="after">
+                    <field name="message_email_pref"/>
+                </xpath>
+                <xpath expr="/form/notebook" position="after">
+                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </xpath>
+            </data>
+            </field>
+        </record>
+
+    </data>
+</openerp>