Reordered condition to avoid calling allow_migrate() if unneeded.

2014-11-15 15:52:35 +01:00 · 2014-11-15 15:52:35 +01:00 · 82aca216e1
parent 8fce797830
commit 82aca216e1
1 changed files with 2 additions and 2 deletions
--- a/django/db/migrations/operations/base.py
+++ b/django/db/migrations/operations/base.py
@ -104,10 +104,10 @@ class Operation(object):
        if it's a proxy, if it's managed, and if it's swapped out.
        """
        return (
-            router.allow_migrate(connection_alias, model) and
            not model._meta.proxy and
            not model._meta.swapped and
-            model._meta.managed
+            model._meta.managed and
+            router.allow_migrate(connection_alias, model)
        )

    def __repr__(self):