encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-05 04:50:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:kakulukia/django-rest-framework

Browse Source 
# By kakulukia
# Via kakulukia
* 'master' of github.com:kakulukia/django-rest-framework:
  allow to work like in django admin which also tries to call the given methon on the object itself
  Update fields.py

Conflicts:
	rest_framework/fields.py
This commit is contained in:
Andy Grabow 2014-10-20 11:04:47 +02:00
commit 74ac2d2489
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rest_framework/fields.py
View File

@ -1045,5 +1045,10 @@ class SerializerMethodField(Field):
super(SerializerMethodField, self).__init__(*args, **kwargs)
def field_to_native(self, obj, field_name):
value = getattr(self.parent, self.method_name)(obj)
if hasattr(self.parent, self.method_name):
method = getattr(self.parent, self.method_name)
value = method(obj)
else:
method = getattr(obj, self.method_name)
value = method()
return self.to_native(value)