Minor SQLa model_form refactoring

flask_admin/contrib/sqla/form.py

@@ -69,21 +69,7 @@ class AdminModelConverter(ModelConverterBase):
 
         return None
 
-    def convert(self, model, mapper, prop, field_args, hidden_pk):
-        # Properly handle forced fields
-        if isinstance(prop, FieldPlaceholder):
-            return form.recreate_field(prop.field)
-
-        kwargs = {
-            'validators': [],
-            'filters': []
-        }
-
-        if field_args:
-            kwargs.update(field_args)
-
-        # Check if it is relation or property
-        if hasattr(prop, 'direction'):
+    def _convert_relation(self, prop, kwargs):
         remote_model = prop.mapper.class_
         local_column = prop.local_remote_pairs[0][0]
 
@@ -124,6 +110,23 @@ class AdminModelConverter(ModelConverterBase):
             return QuerySelectMultipleField(**kwargs)
         elif prop.direction.name == 'MANYTOMANY':
             return QuerySelectMultipleField(**kwargs)
+
+    def convert(self, model, mapper, prop, field_args, hidden_pk):
+        # Properly handle forced fields
+        if isinstance(prop, FieldPlaceholder):
+            return form.recreate_field(prop.field)
+
+        kwargs = {
+            'validators': [],
+            'filters': []
+        }
+
+        if field_args:
+            kwargs.update(field_args)
+
+        # Check if it is relation or property
+        if hasattr(prop, 'direction'):
+            return self._convert_relation(prop, kwargs)
         else:
             # Ignore pk/fk
             if hasattr(prop, 'columns'):