Merge lp:~jfb-tempo-consulting/unifield-web/US-3961 into lp:unifield-web

[jftempo]

=== modified file 'addons/openerp/controllers/database.py'
--- addons/openerp/controllers/database.py	2017-11-25 10:50:11 +0000
+++ addons/openerp/controllers/database.py	2018-03-01 09:44:27 +0000
@@ -442,12 +442,73 @@
                 ('backup', 'auto_bck_interval_unit', ('minutes', 'hours', 'work_days', 'days', 'weeks', 'months')),
                 ('reconfigure', 'delivery_process', ('complex', 'simple')),
             )
-
             for section, option, possible_values in possible_value_list:
                 self.check_possible_value(config, section, option, possible_values)
                 if self.msg:
                     return
 
+            if config.get('instance', 'instance_level') == 'project':
+                if len(config.get('instance', 'group_names').split(',')) != 3:
+                    self.msg = {
+                        'message': _('Project creation asked, you must set 3 sync groups'),
+                        'title': _('Bad sync groups'),
+                    }
+                    return
+
+            if config.get('instance', 'instance_level') == 'coordo':
+                if len(config.get('instance', 'group_names').split(',')) != 4:
+                    self.msg = {
+                        'message': _('Project creation asked, you must set 3 sync groups'),
+                        'title': _('Bad sync groups'),
+                    }
+                    return
+
+            protocol = 'http'
+            if config.get('instance', 'sync_protocol') == 'xmlrpcs':
+                protocol = 'https'
+            server_rpc = rpc.RPCSession(config.get('instance', 'sync_host'), config.get('instance', 'sync_port'), protocol=protocol)
+            uid = server_rpc.login(config.get('instance', 'sync_server'), config.get('instance', 'sync_user'), config.get('instance', 'sync_pwd'))
+            if uid <= 0:
+                self.msg = {
+                    'message': _('Unable to connect to Sync Server %s:%s,  db:%s, user:%s') % (config.get('instance', 'sync_host'), config.get('instance', 'sync_port'), config.get('instance', 'sync_server'), config.get('instance', 'sync_user')),
+                    'title': _('Sync Server Error'),
+                }
+                return
+
+            config_groups = config.get('instance', 'group_names').split(',')
+            found_group = []
+            groups_ids = server_rpc.execute('object', 'execute', 'sync.server.entity_group', 'search', [('name', 'in', config_groups)])
+            for x in server_rpc.execute('object', 'execute', 'sync.server.entity_group', 'read', groups_ids, ['name', 'oc']):
+                found_group.append(x['name'])
+                if x['oc'].lower() != config.get('instance', 'oc').lower():
+                    self.msg = {
+                        'message': _('Group %s has not the same OC (configured: %s)') % (x['name'], config.get('instance', 'oc')),
+                        'title': _('Sync Group'),
+                    }
+                    return
+
+            if set(config_groups) - set(found_group):
+                self.msg = {
+                    'message': _('Sync Groups %s not found on sync server') % (", ".join(list(set(config_groups) - set(found_group)),)),
+                    'title': _('Sync Group'),
+                }
+                return
+
+            if not server_rpc.execute('object', 'execute', 'sync.server.entity', 'search', [('name', '=', config.get('instance', 'parent_instance'))]):
+                self.msg = {
+                    'message': _('Parent Instance %s not found on sync server') % (config.get('instance', 'parent_instance'), ),
+                    'title': _('Parent Instance'),
+                }
+                return
+
+            if not server_rpc.execute('object', 'execute', 'sync.server.update', 'search', [('model', '=', 'msf.instance'), ('values', 'like', "'%s'" % config.get('instance', 'instance_name'))]):
+                self.msg = {
+                    'message': _('No update found for %s. Did you create the new instance at HQ ?') % (config.get('instance', 'instance_name'), ),
+                    'title': _('HQ creation'),
+                }
+                return
+
+
         except NoOptionError as e:
             self.msg = {'message': ustr(_('No option \'%s\' found for the section \'[%s]\' in the config file \'%s\'') % (e.option, e.section, file_path)),
                         'title': ustr(_('Option missing in configuration file'))}
 
=== modified file 'addons/openerp/controllers/form.py'
--- addons/openerp/controllers/form.py	2017-10-27 12:14:43 +0000
+++ addons/openerp/controllers/form.py	2018-03-01 09:44:27 +0000
@@ -513,7 +513,7 @@
                 #    Model.write([params.id], modified, ctx)
                 #else:
                 #    Model.write([params.id], data, ctx)
-                Model.write([params.id], data, ctx)
+                Model.write_web([params.id], data, ctx)
 
             tw.ConcurrencyInfo.update(
                 params.model, Model.read([params.id], ['__last_update'], ctx)
 
=== modified file 'addons/openerp/controllers/templates/auto_create_progress.mako'
--- addons/openerp/controllers/templates/auto_create_progress.mako	2017-11-25 10:50:11 +0000
+++ addons/openerp/controllers/templates/auto_create_progress.mako	2018-03-01 09:44:27 +0000
@@ -37,6 +37,7 @@
                             $("div.my_state").text(data.state);
                             if (data.state === 'done') {
                                 clearInterval(interval);
+                                $("#login-button").css({'display': 'inline'})
                             };
                             if (data.monitor_status) {
                                 $("div.my_monitor_status").text(data.monitor_status);
@@ -75,6 +76,10 @@
         <div class="auto_creation_resume">
             <textarea rows="20" cols="80">${resume}</textarea>
         </div>
+
+        <div id="connect_instance" class="auto_creation_resume">
+            <a href="/openerp/login/" id="login-button" style="display:none" class="button-a">Open Login Page</a>
+        </div>
     </div>
 <a class="auto_instance_debug" href="/openerp/login/?style=noauto"><img src="/openerp/static/images/icons/idea.png" alt="debug access" /></a>
 <%include file="footer.mako"/>