Merge lp:~fabien-morin/unifield-server/fm-us-2160 into lp:unifield-server

[jftempo]

[lp:~fabien-morin/unifield-server/fm-us-2160]

4166. By Fabien MORIN on 2017-02-06

US-2160 [FIX] remove password from the list of tracked changes fields.

4167. By Fabien MORIN on 2017-02-06

US-2160 [FIX] add audittrail line on related user when a group is created with
users.
[FIX] m2m syntax on res.groups. i.e write
 {'users': [(3, 73)]}

4168. By Fabien MORIN on 2017-02-15

US-2160 [IMP] do not use view=extended/simple anymore. Add the extended group
to admin at database creation to make possible for him to install other
modules.

4169. By Fabien MORIN on 2017-02-15

US-2160 [FIX] check user_obj have a check_audit method (only if sync_client
installed) before to continue.

4170. By Fabien MORIN on 2017-02-15

US-2160 [FIX] user_id was missing in the call of _track_change_of_users()
[IMP] make the code a bit more crash proof after reading the complet diff of
the ticket.

4171. By Fabien MORIN on 2017-02-16

US-2160 [FIX] typo

4172. By Fabien MORIN on 2017-02-16

US-2160 [MERGE] with latest trunk

4173. By Fabien MORIN on 2017-02-16

US-2160 [FIX] tuple comprenhension return a generator while we need a list or a
tuple.
[FIX] give the list of ids to name_get to have a list of result (instead of
only one).
[IMP] user translation_obj instead of calling self.pool.get all the time

[Fabien MORIN (fabien-morin)]

Fixed

On Monday 20 February 2017 13:06:51 you wrote:
> Diff comments:
> > === modified file 'bin/addons/base/res/res_user.py'
> > --- bin/addons/base/res/res_user.py 2017-01-03 16:05:44 +0000
> > +++ bin/addons/base/res/res_user.py 2017-02-16 09:43:29 +0000
> > @@ -789,6 +761,76 @@
> >
> > 'users': fields.many2many('res.users', 'res_groups_users_rel',
> > 'gid', 'uid', 'Users'),>
> > }
> >
> > + def _track_change_of_users(self, cr, uid, previous_values, user_ids,
> > + vals, context=None):
> > + '''add audittrail entry to the related users if their groups were
> > changed + @param previous_values: list of dict containing
> > groups_ids of the users + @param user_ids: related user ids
> > + @param vals: vals parameter from the write/create
> > + '''
> > + current_values = {}
> > + audit_obj = self.pool.get('audittrail.rule')
> > + if isinstance(user_ids, (int, long)):
> > + user_ids = [user_ids]
> > + if 'users' in vals and user_ids:
> > + if vals['users'] and len(vals['users'][0]) > 2:
> > + users_deleted =
> > list(set(user_ids).difference(vals['users'][0][2])) +
> > users_added = list(set(vals['users'][0][2]).difference(user_ids)) +
> > user_obj = self.pool.get('res.users')
> > + if not hasattr(user_obj, 'check_audit'):
> > + return
> > + audit_rule_ids = user_obj.check_audit(cr, uid, 'write')
> > + if users_deleted:
> > + previous_values = [x for x in previous_values if
> > x['id'] in users_deleted] + current_values =
> > dict((x['id'], x) for x in user_obj.read(cr, uid, users_deleted,
> > ['groups_id'], context=context)) +
> > audit_obj.audit_log(cr, uid, audit_rule_ids, user_obj, users_deleted,
> > 'write', previous_values, current_values, context=context) +
> > if users_added:
> > + previous_values = [x for x in previous_values if
> > x['id'] in users_added] + current_values =
> > dict((x['id'], x) for x in user_obj.read(cr, uid, users_added,
> > ['groups_id'], context=context)) +
> > audit_obj.audit_log(cr, uid, audit_rule_ids, user_obj, users_added,
> > 'write', previous_values, current_values, context=context) +
> > + def create(self, cr, uid, vals, context=None):
> > + '''
> > + In case user have been added, a new audit line should be created
> > on the related users + '''
> > + change_user_group = False
> > + previous_values = []
> > + if 'users' in vals and vals['users'] and len(vals['users'][0]) >
> > 2: + user_obj = self.pool.get('res.users')
> > + previous_values = user_obj.read(cr, uid, vals['users'][0][2],
> > ['groups_id'], context=context) + change_user_group = True
> > + user_id = super(groups, self).create(cr, uid, vals,
> > context=context)
> > + if change_user_group:
> "Funny" bug here: you a not in groups() class but in groups2, so it should
> be user_id = super(grou...

[lp:~fabien-morin/unifield-server/fm-us-2160]

4174. By Fabien MORIN on 2017-02-20

US-2160 [FIX] the current class is groups2, not groups

Unmerged revisions

4174. By Fabien MORIN on 2017-02-20

US-2160 [FIX] the current class is groups2, not groups

=== modified file 'bin/addons/base/base_update.xml'
--- bin/addons/base/base_update.xml	2016-11-16 07:57:07 +0000
+++ bin/addons/base/base_update.xml	2017-02-20 13:31:41 +0000
@@ -139,7 +139,6 @@
                                 <field name="context_lang"/>
                                 <field name="context_tz"/>
                                 <group colspan="2" col="4">
-                                     <field name="view" readonly="0"/>
                                      <field name="menu_tips" colspan="2"/>
                                 </group>
                             </group>
@@ -314,57 +313,11 @@
             <field name="target">new</field>
         </record>
 
-        <record id="view_confirm_simple_view_form" model="ir.ui.view">
-            <field name="name">Configure Your Interface</field>
-            <field name="model">res.config.view</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="res_config_view_base"/>
-            <field name="arch" type="xml">
-              <data>
-                <form position="attributes">
-                  <attribute name="string">Configure Your Interface</attribute>
-                </form>
-                <xpath expr="//label[@string='description']"
-                     position="attributes">
-                <attribute name="string">If you use OpenERP for the first time we strongly advise you to select the simplified interface, which has less features but is easier. You can always switch later from the user preferences.</attribute>
-              </xpath>
-              <xpath expr='//separator[@string="title"]' position='attributes'>
-                    <attribute name='string'>Configure Your Interface</attribute>
-              </xpath>
-              <xpath expr='//separator[@string="vsep"]' position='attributes'>
-                    <attribute name='string'></attribute>
-                    <attribute name='rowspan'>12</attribute>
-              </xpath>
-               <group string="res_config_contents" position="replace">
-                      <group colspan="4">
-                          <field colspan="4" name="view" nolabel="1"/>
-                    </group>
-                </group>
-                <xpath expr='//button[@name="action_skip"]' position='replace'/>
-              </data>
-            </field>
-        </record>
-
-        <record id="action_config_simple_view_form" model="ir.actions.act_window">
-            <field name="name">Configure Your Interface</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">res.config.view</field>
-            <field name="view_type">form</field>
-            <field name="view_id" ref="view_confirm_simple_view_form"/>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-
         <record id="config_wizard_step_user" model="ir.actions.todo">
             <field name="action_id" ref="action_config_user_form"/>
             <field name="sequence">10</field>
             <field name="restart">never</field>
             <field name="state">done</field>
         </record>
-        <record id="config_wizard_simple_view" model="ir.actions.todo">
-            <field name="action_id" ref="action_config_simple_view_form"/>
-            <field name="restart">always</field>
-            <field name="sequence">1</field>
-        </record>
     </data>
 </openerp>

=== modified file 'bin/addons/base/res/res_user.py'
--- bin/addons/base/res/res_user.py	2017-01-03 16:05:44 +0000
+++ bin/addons/base/res/res_user.py	2017-02-20 13:31:41 +0000
@@ -114,6 +114,7 @@
     _uid_cache = {}
     _name = "res.users"
     _order = 'name'
+    _trace = True
 
     WELCOME_MAIL_SUBJECT = u"Welcome to OpenERP"
     WELCOME_MAIL_BODY = u"An OpenERP account has been created for you, "\
@@ -178,36 +179,6 @@
                                 body=self.get_welcome_mail_body(
                                     cr, uid, context=context) % user)
 
-    def _set_interface_type(self, cr, uid, ids, name, value, arg, context=None):
-        """Implementation of 'view' function field setter, sets the type of interface of the users.
-        @param name: Name of the field
-        @param arg: User defined argument
-        @param value: new value returned
-        @return:  True/False
-        """
-        if not value or value not in ['simple','extended']:
-            return False
-        group_obj = self.pool.get('res.groups')
-        extended_group_id = group_obj.get_extended_interface_group(cr, uid, context=context)
-        # First always remove the users from the group (avoids duplication if called twice)
-        self.write(cr, uid, ids, {'groups_id': [(3, extended_group_id)]}, context=context)
-        # Then add them back if requested
-        if value == 'extended':
-            self.write(cr, uid, ids, {'groups_id': [(4, extended_group_id)]}, context=context)
-        return True
-
-
-    def _get_interface_type(self, cr, uid, ids, name, args, context=None):
-        """Implementation of 'view' function field getter, returns the type of interface of the users.
-        @param field_name: Name of the field
-        @param arg: User defined argument
-        @return:  Dictionary of values
-        """
-        group_obj = self.pool.get('res.groups')
-        extended_group_id = group_obj.get_extended_interface_group(cr, uid, context=context)
-        extended_users = group_obj.read(cr, uid, extended_group_id, ['users'], context=context)['users']
-        return dict(zip(ids, ['extended' if user in extended_users else 'simple' for user in ids]))
-
     def _email_get(self, cr, uid, ids, name, arg, context=None):
         # perform this as superuser because the current user is allowed to read users, and that includes
         # the email, even without any direct read access on the res_partner_address object.
@@ -294,8 +265,9 @@
         for user_id in ids:
             level = False
             company_id = self._get_company(cr, user_id, context=context)
-            instance_id = self.pool.get('res.company').read(cr, uid, company_id,
-                                                            ['instance_id'], context=context)['instance_id']
+            company_obj = self.pool.get('res.company')
+            instance_id = company_obj.read(cr, uid, company_id,
+                    ['instance_id'], context=context).get('instance_id', False)
             instance_id = instance_id and instance_id[0] or False
             if instance_id:
                 level = self.pool.get('msf.instance').read(cr, uid, instance_id, ['level'], context=context)['level']
@@ -341,8 +313,7 @@
         'context_tz': fields.selection(_tz_get,  'Timezone', size=64,
                                        help="The user's timezone, used to perform timezone conversions "
                                        "between the server and the client."),
-        'view': fields.function(_get_interface_type, method=True, type='selection', fnct_inv=_set_interface_type,
-                                selection=[('simple','Simplified'),('extended','Extended')],
+        'view': fields.selection([('simple','Simplified'),('extended','Extended')],
                                 string='Interface', help="Choose between the simplified interface and the extended one"),
         'user_email': fields.function(_email_get, method=True, fnct_inv=_email_set, string='Email', type="char", size=240),
         'menu_tips': fields.boolean('Menu Tips', help="Check out this box if you want to always display tips on each menu action"),
@@ -452,6 +423,7 @@
         'address_id': False,
         'menu_tips':True,
         'force_password_change': False,
+        'view': 'simple',
     }
 
     @tools.cache()
@@ -789,6 +761,76 @@
         'users': fields.many2many('res.users', 'res_groups_users_rel', 'gid', 'uid', 'Users'),
     }
 
+    def _track_change_of_users(self, cr, uid, previous_values, user_ids,
+            vals, context=None):
+        '''add audittrail entry to the related users if their groups were changed
+        @param previous_values: list of dict containing groups_ids of the users
+        @param user_ids: related user ids
+        @param vals: vals parameter from the write/create
+        '''
+        current_values = {}
+        audit_obj = self.pool.get('audittrail.rule')
+        if isinstance(user_ids, (int, long)):
+            user_ids = [user_ids]
+        if 'users' in vals and user_ids:
+            if vals['users'] and len(vals['users'][0]) > 2:
+                users_deleted = list(set(user_ids).difference(vals['users'][0][2]))
+                users_added = list(set(vals['users'][0][2]).difference(user_ids))
+                user_obj = self.pool.get('res.users')
+                if not hasattr(user_obj, 'check_audit'):
+                    return
+                audit_rule_ids = user_obj.check_audit(cr, uid, 'write')
+                if users_deleted:
+                    previous_values = [x for x in previous_values if x['id'] in users_deleted]
+                    current_values = dict((x['id'], x) for x in user_obj.read(cr, uid, users_deleted, ['groups_id'], context=context))
+                    audit_obj.audit_log(cr, uid, audit_rule_ids, user_obj, users_deleted, 'write', previous_values, current_values, context=context)
+                if users_added:
+                    previous_values = [x for x in previous_values if x['id'] in users_added]
+                    current_values = dict((x['id'], x) for x in user_obj.read(cr, uid, users_added, ['groups_id'], context=context))
+                    audit_obj.audit_log(cr, uid, audit_rule_ids, user_obj, users_added, 'write', previous_values, current_values, context=context)
+
+    def create(self, cr, uid, vals, context=None):
+        '''
+        In case user have been added, a new audit line should be created on the related users
+        '''
+        change_user_group = False
+        previous_values = []
+        if 'users' in vals and vals['users'] and len(vals['users'][0]) > 2:
+            user_obj = self.pool.get('res.users')
+            previous_values = user_obj.read(cr, uid, vals['users'][0][2], ['groups_id'], context=context)
+            change_user_group = True
+        user_id = super(groups2, self).create(cr, uid, vals, context=context)
+        if change_user_group:
+            self._track_change_of_users(cr, uid, previous_values, [user_id],
+                    vals, context=context)
+        return user_id
+
+    def write(self, cr, uid, ids, vals, context=None):
+        '''
+        In case user have been added or deleted, a new audit line should be created on the related users
+        '''
+        all_user_ids = [] # previous user ids + current
+        previous_values = []
+        user_ids = []
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        if 'users' in vals:
+            new_user_ids = []
+            if vals['users'] and len(vals['users'][0]) > 2:
+                new_user_ids = vals['users'][0][2]
+            for record in self.read(cr, uid, ids, ['users'], context=context):
+                if record['users']:
+                    user_ids.extend(record['users'])
+            all_user_ids = set(new_user_ids).union(user_ids)
+            user_obj = self.pool.get('res.users')
+            previous_values = user_obj.read(cr, uid, all_user_ids, ['groups_id'], context=context)
+
+        res = super(groups2, self).write(cr, uid, ids, vals, context=context)
+        if 'users' in vals:
+            self._track_change_of_users(cr, uid, previous_values, user_ids,
+                    vals, context=context)
+        return res
+
     def unlink(self, cr, uid, ids, context=None):
         group_users = []
         for record in self.read(cr, uid, ids, ['users'], context=context):
@@ -814,10 +856,10 @@
         'name':fields.char('Name', size=64),
         'view': fields.selection([('simple','Simplified'),
                                   ('extended','Extended')],
-                                 'Interface', required=True ),
+                                 'Interface', required=False ),
     }
     _defaults={
-        'view':lambda self,cr,uid,*args: self.pool.get('res.users').browse(cr, uid, uid).view or 'simple',
+        'view': 'simple',
     }
 
     def execute(self, cr, uid, ids, context=None):

=== modified file 'bin/addons/msf_audittrail/__openerp__.py'
--- bin/addons/msf_audittrail/__openerp__.py	2016-06-07 15:10:42 +0000
+++ bin/addons/msf_audittrail/__openerp__.py	2017-02-20 13:31:41 +0000
@@ -46,6 +46,7 @@
         'data/audittrail_data_purchase.yml',
         'data/audittrail_data_products.yml',
         'data/audittrail_data_JI.yml',
+        'data/audittrail_res_users.yml',
         'audittrail_report.xml',
         'audittrail_invoice_data.yml',
     ],

=== modified file 'bin/addons/msf_audittrail/audittrail.py'
--- bin/addons/msf_audittrail/audittrail.py	2017-02-06 11:14:07 +0000
+++ bin/addons/msf_audittrail/audittrail.py	2017-02-20 13:31:41 +0000
@@ -795,7 +795,7 @@
     """
     _name = 'audittrail.log.line'
     _description = "Log Line"
-    _order = 'timestamp desc, id desc'
+    _order = 'timestamp desc, log desc'
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         """
@@ -1050,9 +1050,8 @@
             res = []
             if values and values != '[]':
                 values = values[1:-1].split(',')
-                values = (int(v) for v in values)
-                res = [x[1] for x in relation_model_pool.name_get(cr, uid,
-                                                                  [long(values[0])])]
+                values = [int(v) for v in values]
+                res = [x[1] for x in relation_model_pool.name_get(cr, uid, values)]
             return res
         elif field['ttype'] == 'date':
             res = False
@@ -1076,15 +1075,16 @@
         elif field['ttype'] == 'selection':
             res = False
             if values:
+                translation_obj = self.pool.get('ir.translation')
                 fct_object = model_pool.browse(cr, uid, model.id, context=context).model
                 sel = self.pool.get(fct_object).fields_get(cr, uid, [field['name']])
                 if field['name'] in sel:
                     res = dict(sel[field['name']]['selection']).get(values)
                     name = '%s,%s' % (fct_object, field['name'])
                     # Search translation
-                    res_tr_ids = self.pool.get('ir.translation').search(cr, uid, [('type', '=', 'selection'), ('name', '=', name), ('src', 'in', [values])])
+                    res_tr_ids = translation_obj.search(cr, uid, [('type', '=', 'selection'), ('name', '=', name), ('src', 'in', [values])])
                     if res_tr_ids:
-                        res = self.pool.get('ir.translation').read(cr, uid, res_tr_ids, ['value'])[0]['value']
+                        res = translation_obj.read(cr, uid, res_tr_ids, ['value'])[0]['value']
                 else:
                     res = values
             return res

=== added file 'bin/addons/msf_audittrail/data/audittrail_res_users.yml'
--- bin/addons/msf_audittrail/data/audittrail_res_users.yml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_audittrail/data/audittrail_res_users.yml	2017-02-20 13:31:41 +0000
@@ -0,0 +1,69 @@
+-
+  For Users, rule for the CREATE of objects with the list of fields to track
+-
+  !python {model: audittrail.rule}: |
+    name = 'USER CREATE'
+    object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'res.users')], context=context)
+    rule_id = self.search(cr, uid, [('name', '=', name)], context=context)
+    if object_ids:
+        fields = ['action_id', 'active', 'address_id', 'email', 'force_password_change', 'groups_id', 'login', 'menu_id', 'menu_tips', 'name', 'signature', 'user_email']
+        fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'res.users'), ('name', 'in', fields)], context=context)
+        vals = {'name': name,
+                'object_id': object_ids[0],
+                'log_create': True,
+                'log_write': False,
+                'log_unlink': False,
+                'field_ids': [(6, 0, fields_ids)],
+                }
+        if not rule_id:
+            rule_id = self.create(cr, uid, vals, context=context)
+        elif rule_id:
+            self.write(cr, uid, rule_id, vals, context=context)
+        # Subscribe to the rule
+        self.subscribe(cr, uid, rule_id)
+-
+  For Users, rule for the WRITE of objects with the list of fields to track
+-
+  !python {model: audittrail.rule}: |
+    name = 'USER WRITE'
+    object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'res.users')], context=context)
+    rule_id = self.search(cr, uid, [('name', '=', name)], context=context)
+    if object_ids:
+        fields = ['action_id', 'active', 'address_id', 'email', 'force_password_change', 'groups_id', 'login', 'menu_id', 'menu_tips', 'name', 'signature', 'user_email']
+        fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'res.users'), ('name', 'in', fields)], context=context)
+        vals = {'name': name,
+                'object_id': object_ids[0],
+                'log_create': False,
+                'log_write': True,
+                'log_unlink': False,
+                'field_ids': [(6, 0, fields_ids)],
+                }
+        if not rule_id:
+            rule_id = self.create(cr, uid, vals, context=context)
+        elif rule_id:
+            self.write(cr, uid, rule_id, vals, context=context)
+        # Subscribe to the rule
+        self.subscribe(cr, uid, rule_id)
+-
+  For USERS, rule for the DELETE of objects with the list of fields to track
+-
+  !python {model: audittrail.rule}: |
+    name = 'USER DELETE'
+    object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'res.users')], context=context)
+    rule_id = self.search(cr, uid, [('name', '=', name)], context=context)
+    if object_ids:
+        fields = ['name']
+        fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'res.users'), ('name', 'in', fields)], context=context)
+        vals = {'name': name,
+                'object_id': object_ids[0],
+                'log_create': False,
+                'log_write': False,
+                'log_unlink': True,
+                'field_ids': [(6, 0, fields_ids)],
+                }
+        if not rule_id:
+            rule_id = self.create(cr, uid, vals, context=context)
+        elif rule_id:
+            self.write(cr, uid, rule_id, vals, context=context)
+        # Subscribe to the rule
+        self.subscribe(cr, uid, rule_id)

=== modified file 'bin/addons/unifield_setup/unifield_setup_data.xml'
--- bin/addons/unifield_setup/unifield_setup_data.xml	2012-11-19 17:26:48 +0000
+++ bin/addons/unifield_setup/unifield_setup_data.xml	2017-02-20 13:31:41 +0000
@@ -3,12 +3,6 @@
 	<data noupdate="0">
 	    
 	    <!-- Re-order the configuration wizards sequences -->
-	    <record id="base.config_wizard_simple_view" model="ir.actions.todo">
-	    	<field name="sequence" eval="1" />
-	    	<field name="restart">never</field>
-	    	<field name="state">done</field>
-	    </record>
-	    
 	    <record id="base_setup.base_setup_company_todo" model="ir.actions.todo">
 	    	<field name="sequence" eval="17" />
 	    	<field name="restart">always</field>

=== modified file 'bin/service/web_services.py'
--- bin/service/web_services.py	2017-01-31 11:13:35 +0000
+++ bin/service/web_services.py	2017-02-20 13:31:41 +0000
@@ -167,12 +167,21 @@
                         mids = modobj.search(cr, 1, [('state', '=', 'installed')])
                         modobj.update_translations(cr, 1, mids, lang)
 
-                    cr.execute('UPDATE res_users SET password=%s, context_lang=%s, active=True WHERE login=%s', (
+                    cr.execute('UPDATE res_users SET password=%s, context_lang=%s, active=True WHERE login=%s RETURNING id', (
                         user_password, lang, 'admin'))
+                    uid = cr.fetchone()[0]
                     cr.execute('SELECT login, password, name ' \
                                '  FROM res_users ' \
                                ' ORDER BY login')
                     serv.actions[id]['users'] = cr.dictfetchall()
+
+                    # add the extended interface group to the admin user
+                    # this is needed to be able to install other modules
+                    res_group_obj = pool.get('res.groups')
+                    group_extended_id = res_group_obj.get_extended_interface_group(cr, 1)
+                    if group_extended_id:
+                        res_users_obj = pool.get('res.users')
+                        res_users_obj.write(cr, uid, uid, {'groups_id': [(4, group_extended_id)]})
                     serv.actions[id]['clean'] = True
                     cr.commit()
                 except Exception, e: