Rename has_user_through_model -> has_through_model

This commit is contained in:
Tom Christie 2013-05-18 15:25:49 +01:00
parent e1a3cab400
commit 5f8d353f0b

View File

@ -591,7 +591,7 @@ class ModelSerializer(Serializer):
forward_rels += [field for field in opts.many_to_many if field.serialize] forward_rels += [field for field in opts.many_to_many if field.serialize]
for model_field in forward_rels: for model_field in forward_rels:
has_user_through_model = False has_through_model = False
if model_field.rel: if model_field.rel:
to_many = isinstance(model_field, to_many = isinstance(model_field,
@ -599,7 +599,7 @@ class ModelSerializer(Serializer):
related_model = model_field.rel.to related_model = model_field.rel.to
if to_many and not model_field.rel.through._meta.auto_created: if to_many and not model_field.rel.through._meta.auto_created:
has_user_through_model = True has_through_model = True
if model_field.rel and nested: if model_field.rel and nested:
if len(inspect.getargspec(self.get_nested_field).args) == 2: if len(inspect.getargspec(self.get_nested_field).args) == 2:
@ -629,7 +629,7 @@ class ModelSerializer(Serializer):
field = self.get_field(model_field) field = self.get_field(model_field)
if field: if field:
if has_user_through_model: if has_through_model:
field.read_only = True field.read_only = True
ret[model_field.name] = field ret[model_field.name] = field
@ -649,12 +649,12 @@ class ModelSerializer(Serializer):
continue continue
related_model = relation.model related_model = relation.model
to_many = relation.field.rel.multiple to_many = relation.field.rel.multiple
has_user_through_model = False has_through_model = False
is_m2m = isinstance(relation.field, is_m2m = isinstance(relation.field,
models.fields.related.ManyToManyField) models.fields.related.ManyToManyField)
if is_m2m and not relation.field.rel.through._meta.auto_created: if is_m2m and not relation.field.rel.through._meta.auto_created:
has_user_through_model = True has_through_model = True
if nested: if nested:
field = self.get_nested_field(None, related_model, to_many) field = self.get_nested_field(None, related_model, to_many)
@ -662,7 +662,7 @@ class ModelSerializer(Serializer):
field = self.get_related_field(None, related_model, to_many) field = self.get_related_field(None, related_model, to_many)
if field: if field:
if has_user_through_model: if has_through_model:
field.read_only = True field.read_only = True
ret[accessor_name] = field ret[accessor_name] = field