Commit a0155f35 authored by Anssi Kääriäinen's avatar Anssi Kääriäinen
Browse files

[1.5.x] Refactored proxy model skipping in get_default_columns()

The refactoring allows custom subclasses to use different default
columns than the base model.
parent 9e718307
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -255,8 +255,6 @@ class SQLCompiler(object):
        result = []
        if opts is None:
            opts = self.query.model._meta
        # Skip all proxy to the root proxied model
        opts = opts.concrete_model._meta
        qn = self.quote_name_unless_alias
        qn2 = self.connection.ops.quote_name
        aliases = set()
@@ -265,6 +263,10 @@ class SQLCompiler(object):
        if start_alias:
            seen = {None: start_alias}
        for field, model in opts.get_fields_with_model():
            # For local fields (even if through proxy) the model should
            # be None.
            if model == opts.concrete_model:
                model = None
            if local_only and model is not None:
                continue
            if start_alias: