rename field

Author: timgraham

django_mongodb_backend/fields/__init__.py

@@ -4,15 +4,13 @@
 from .embedded_model import EmbeddedModelField
 from .embedded_model_array import EmbeddedModelArrayField
 from .json import register_json_field
-from .multiple_embedded_model import MultipleEmbeddedModelField
 from .objectid import ObjectIdField
 
 __all__ = [
     "register_fields",
     "ArrayField",
     "EmbeddedModelArrayField",
     "EmbeddedModelField",
-    "MultipleEmbeddedModelField",
     "ObjectIdAutoField",
     "ObjectIdField",
 ]

django_mongodb_backend/fields/multiple_embedded_model.py

@@ -1,7 +1,6 @@
 from .fields import (
     EmbeddedModelArrayField,
     EmbeddedModelField,
-    MultipleEmbeddedModelFormField,
     ObjectIdField,
     SimpleArrayField,
     SplitArrayField,
@@ -11,7 +10,6 @@
 __all__ = [
     "EmbeddedModelArrayField",
     "EmbeddedModelField",
-    "MultipleEmbeddedModelFormField",
     "SimpleArrayField",
     "SplitArrayField",
     "SplitArrayWidget",

django_mongodb_backend/forms/__init__.py

@@ -1,10 +1,6 @@
 from django.db import models
 
-<<<<<<< HEAD
 from django_mongodb_backend.fields import EmbeddedModelArrayField, EmbeddedModelField
-=======
-from django_mongodb_backend.fields import EmbeddedModelField, MultipleEmbeddedModelField
->>>>>>> fc07a29 (wip forms)
 from django_mongodb_backend.models import EmbeddedModel
 
 
@@ -43,8 +39,8 @@ def __str__(self):
 
 class Movie(models.Model):
     title = models.CharField(max_length=255)
-    reviews = MultipleEmbeddedModelField(Review)
-    featured_reviews = MultipleEmbeddedModelField(Review, null=True, blank=True)
+    reviews = EmbeddedModelArrayField(Review)
+    featured_reviews = EmbeddedModelArrayField(Review, null=True, blank=True)
 
     def __str__(self):
         return self.title