Projet

Général

Profil

0001-multitenant-always-sort-tenants-25673.patch

Frédéric Péters, 14 août 2018 08:17

Télécharger (2,41 ko)

Voir les différences: 

Subject: [PATCH] multitenant: always sort tenants (#25673)


 hobo/multitenant/management/commands/__init__.py        | 1 -
 hobo/multitenant/management/commands/migrate_schemas.py | 3 +--
 hobo/multitenant/middleware.py                          | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)
hobo/multitenant/management/commands/__init__.py
92 92 

  		




  93
  93
  
    
    def get_tenant_from_options_or_interactive(self, **options):

  		




  94
  94
  
    
        all_tenants = list(TenantMiddleware.get_tenants())

  		




  95
  
  
    
        all_tenants.sort(key=lambda x: x.domain_url)

  		




  96
  95
  
    

  		




  97
  96
  
    
        if not all_tenants:

  		




  98
  97
  
    
            raise CommandError("""There are no tenants in the system.

  		












  

    
      hobo/multitenant/management/commands/migrate_schemas.py
    
  





  45
  45
  
    
                else:

  		




  46
  46
  
    
                    self.run_migrations(self.schema_name, settings.TENANT_APPS)

  		




  47
  47
  
    
            else:

  		




  48
  
  
    
                all_tenants = TenantMiddleware.get_tenants()

  		




  49
  
  
    
                for tenant in sorted(all_tenants, key=lambda x: x.schema_name):

  		




  
  48
  
    
                for tenant in TenantMiddleware.get_tenants():

  		




  50
  49
  
    
                    self.run_migrations(tenant.schema_name, settings.TENANT_APPS)

  		




  51
  50
  
    

  		




  52
  51
  
    
    def run_migrations(self, schema_name, included_apps):

  		












  

    
      hobo/multitenant/middleware.py
    
  





  46
  46
  
    
    @classmethod

  		




  47
  47
  
    
    def get_tenants(cls):

  		




  48
  48
  
    
        self = cls()

  		




  49
  
  
    
        for path in glob.glob(os.path.join(cls.base(), '*')):

  		




  
  49
  
    
        for path in sorted(glob.glob(os.path.join(cls.base(), '*'))):

  		




  50
  50
  
    
            hostname = os.path.basename(path)

  		




  51
  51
  
    
            if hostname.endswith('.invalid'):

  		




  52
  52
  
    
                continue

  		




  53
  
  
    
-