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

[jftempo]

[Fabien MORIN (fabien-morin)]

On mardi 18 juillet 2017 07:06:58 CEST you wrote:
> search is not needed here, the job is done by check_validated
>

Thanks, I removed it.

--
Fabien MORIN
TeMPO Consulting
20, avenue de la Paix
67000 Strasbourg
France

http://www.tempo-consulting.fr
Tel : [phone]
Fax : [phone]

=== modified file 'bin/addons/sync_client/sync_client.py'
--- bin/addons/sync_client/sync_client.py	2017-05-08 09:51:06 +0000
+++ bin/addons/sync_client/sync_client.py	2017-07-18 07:49:42 +0000
@@ -295,6 +295,11 @@
                     entity = self.get_entity(cr, uid, context=context)
                     proxy = self.pool.get("sync.client.sync_server_connection").get_connection(cr, uid, "sync.server.entity")
                     proxy.end_synchronization(entity.identifier, self._hardware_id)
+                    cr.execute('SHOW server_version')
+                    result = cr.fetchone()
+                    pg_version = result and result[0] or 'pgversion not found'
+                    proxy.set_pg_version(entity.identifier, self._hardware_id,
+                            pg_version)
             except SkipStep:
                 # res failed but without exception
                 assert is_step, "Cannot have a SkipTest error outside a sync step process!"

=== modified file 'bin/addons/sync_server/data/audittrail_sync_server.yml'
--- bin/addons/sync_server/data/audittrail_sync_server.yml	2016-11-09 16:33:24 +0000
+++ bin/addons/sync_server/data/audittrail_sync_server.yml	2017-07-18 07:49:42 +0000
@@ -56,7 +56,7 @@
     object_ids = self.pool.get('ir.model').search(cr, uid, [('model', '=', 'sync.server.entity')], context=context)
     rule_id = self.search(cr, uid, [('name', '=', name)], context=context)
     if object_ids:
-        fields = ['name', 'email', 'state', 'children_ids', 'parent_id', 'hardware_id', 'identifier', 'email', 'version_id']
+        fields = ['name', 'email', 'state', 'children_ids', 'parent_id', 'hardware_id', 'identifier', 'email', 'version_id', 'pgversion']
         fields_ids = self.pool.get('ir.model.fields').search(cr, uid, [('model', '=' ,'sync.server.entity'), ('name', 'in', fields)], context=context)
         vals = {'name': name,
                 'object_id': object_ids[0],

=== modified file 'bin/addons/sync_server/sync_server.py'
--- bin/addons/sync_server/sync_server.py	2017-02-24 14:15:56 +0000
+++ bin/addons/sync_server/sync_server.py	2017-07-18 07:49:42 +0000
@@ -230,6 +230,7 @@
         'mission': fields.char('Mission', size=64),
         'latitude': fields.float('Latitude',digits=(16,6)),
         'longitude': fields.float('Longitude', digits=(16,6)),
+        'pgversion': fields.char('Postgres Version', size=64),
     }
     _defaults = {
         'version': lambda *a: 0,
@@ -479,6 +480,11 @@
         self._send_invalidation_email(cr, uid, entity, ids_to_validate, context=context)
         return (True, "Instance %s are now invalidated" % ", ".join(uuid_list))
 
+    @check_validated
+    def set_pg_version(self, cr, uid, entity, pg_version, context=None):
+        self.write(cr, 1, entity.id, {'pgversion': pg_version}, context=context)
+        return True
+
     def validate_action(self, cr, uid, ids, context=None):
         if not context:
             context = {}

=== modified file 'bin/addons/update_server/entity.xml'
--- bin/addons/update_server/entity.xml	2012-07-09 16:04:00 +0000
+++ bin/addons/update_server/entity.xml	2017-07-18 07:49:42 +0000
@@ -10,6 +10,7 @@
             <field name="arch" type="xml">
             	<field name="identifier" position="after">
             	 <field name="version_id" ></field>
+            	 <field name="pgversion" ></field>
                 </field>
             </field>
         </record>
@@ -22,8 +23,9 @@
             <field name="arch" type="xml">
             	<field name="state" position="after">
                 	<field name="version_id" ></field>
+                    <field name="pgversion" ></field>
                 </field>
             </field>
         </record>
     </data>
- </openerp>
\ No newline at end of file
+ </openerp>