Replace field.rel.to with field.remote_field.model

Field.rel and Field.remote_field.to are removed in Django 2.x

orchestra/contrib/mailboxes/signals.py

@@ -27,7 +27,7 @@ def create_local_address(sender, *args, **kwargs):
     mbox = kwargs['instance']
     local_domain = settings.MAILBOXES_LOCAL_DOMAIN
     if not mbox.pk and local_domain:
-        Domain = Address._meta.get_field('domain').rel.to
+        Domain = Address._meta.get_field('domain').remote_field.model
         try:
             domain = Domain.objects.get(name=local_domain)
         except Domain.DoesNotExist:

orchestra/contrib/orders/helpers.py

@@ -16,7 +16,7 @@ def get_related_object(origin, max_depth=2):
             if hasattr(field, 'ct_field'):
                 yield getattr(node, field.name)
         for field in node._meta.fields:
-            if field.rel:
+            if field.remote_field:
                 try:
                     yield getattr(node, field.name)
                 except ObjectDoesNotExist:

orchestra/contrib/resources/admin.py

@@ -98,7 +98,7 @@ class ResourceAdmin(ExtendedModelAdmin):
         """ filter service content_types """
         if db_field.name == 'content_type':
             models = [ model._meta.model_name for model in services.get() ]
-            kwargs['queryset'] = db_field.rel.to.objects.filter(model__in=models)
+            kwargs['queryset'] = db_field.remote_field.model.objects.filter(model__in=models)
         return super(ResourceAdmin, self).formfield_for_dbfield(db_field, **kwargs)
 
 

orchestra/contrib/resources/models.py

@@ -342,7 +342,7 @@ def create_resource_relation():
             pass
         else:
             related._meta.private_fields = [
-                field for field in related._meta.private_fields if field.rel.to != ResourceData
+                field for field in related._meta.private_fields if field.remote_field.model != ResourceData
             ]
 
     for ct, resources in Resource.objects.group_by('content_type').items():

orchestra/contrib/saas/fields.py

@@ -11,5 +11,4 @@ class VirtualDatabaseRelation(GenericRelation):
                 pks.append(obj.database_id)
         if not pks:
             return []
-        # TODO renamed to self.remote_field in django 1.8
+        return self.remote_field.model._base_manager.db_manager(using).filter(pk__in=pks)
-        return self.rel.to._base_manager.db_manager(using).filter(pk__in=pks)

orchestra/contrib/saas/services/options.py

@@ -168,7 +168,7 @@ class DBSoftwareService(SoftwareService):
     @cached
     def get_account(self):
         account_model = self.instance._meta.get_field('account')
-        return account_model.rel.to.objects.get_main()
+        return account_model.remote_field.model.objects.get_main()
 
     def validate(self):
         super(DBSoftwareService, self).validate()

orchestra/contrib/services/admin.py

@@ -59,7 +59,7 @@ class ServiceAdmin(ChangeViewActionsMixin, admin.ModelAdmin):
         """ Improve performance of account field and filter by account """
         if db_field.name == 'content_type':
             models = [model._meta.model_name for model in services.get()]
-            queryset = db_field.rel.to.objects
+            queryset = db_field.remote_field.model.objects
             kwargs['queryset'] = queryset.filter(model__in=models)
         if db_field.name in ['match', 'metric', 'order_description']:
             kwargs['widget'] = forms.TextInput(attrs={'size':'160'})

orchestra/contrib/webapps/fields.py

@@ -12,8 +12,7 @@ class VirtualDatabaseRelation(GenericRelation):
                 pks.append(db_id)
         if not pks:
             return []
-        # TODO renamed to self.remote_field in django 1.8
+        return self.remote_field.model._base_manager.db_manager(using).filter(pk__in=pks)
-        return self.rel.to._base_manager.db_manager(using).filter(pk__in=pks)
 
 
 class VirtualDatabaseUserRelation(GenericRelation):
@@ -26,5 +25,4 @@ class VirtualDatabaseUserRelation(GenericRelation):
                 pks.append(db_id)
         if not pks:
             return []
-        # TODO renamed to self.remote_field in django 1.8
+        return self.remote_field.model._base_manager.db_manager(using).filter(pk__in=pks)
-        return self.rel.to._base_manager.db_manager(using).filter(pk__in=pks)

orchestra/models/utils.py

@@ -50,9 +50,9 @@ def get_model_field_path(origin, target):
         if node == target:
             return path
         for field in node._meta.fields:
-            if field.rel:
+            if field.remote_field:
                 new_model = list(model)
-                new_model.append(field.rel.to)
+                new_model.append(field.remote_field.model)
                 new_path = list(path)
                 new_path.append(field.name)
                 queue.append((new_model, new_path))