← Back to branch summary

~dorian-kemps/unifield-web/US-6728

« back to all changes in this revision

Viewing changes to addons/openerp/controllers/database.py

  • Committer: jf
  • Date: 2019-05-23 08:14:46 UTC
  • Revision ID: jfb@tempo-consulting.fr-20190523081446-9ppj2dax8qd91n7a
US-5690 [FIX] Auto db creation: create the empty db with base module installed before starting the web progress bar

Show diffs side-by-side

added added

removed removed

Lines of Context:
addons/openerp/controllers/database.py
527
527
            self.msg = {'message': _('Bad super admin password'),
528
528
                        'title' : e.title}
529
529
 
530
 
    def background_auto_creation(self, password, dbname, db_exists, config_dict):
531
 
        if not db_exists:
532
 
            # create database
533
 
            self.database_creation(password, dbname, config_dict['instance'].get('admin_password'))
534
 
 
 
530
    def background_auto_creation(self, password, dbname, config_dict):
535
531
        rpc.session.execute_db('instance_auto_creation', password, dbname)
536
532
        self.resume, self.progress, self.state, self.error, monitor_status = rpc.session.execute_db('creation_get_resume_progress', dbname)
537
533
 
567
563
                self.resume = _('Empty database creation in progress...\n')
568
564
                #raise DatabaseExist
569
565
 
 
566
            if not db_exists:
 
567
                # create database
 
568
                self.database_creation(password, dbname, config_dict['instance'].get('admin_password'))
 
569
 
570
570
            create_thread = threading.Thread(target=self.background_auto_creation,
571
 
                                             args=(password, dbname, db_exists,
572
 
                                                   config_dict))
 
571
                                             args=(password, dbname, config_dict)
 
572
                            )
573
573
            create_thread.start()
574
574
            create_thread.join(0.5)
575
575