Fixed case where a missing meta_field value would error

Author: jerel

rest_framework_json_api/renderers.py

@@ -325,7 +325,7 @@ def extract_meta(serializer, resource):
             meta = getattr(serializer.child, 'Meta', None)
         else:
             meta = getattr(serializer, 'Meta', None)
-        meta_fields = getattr(meta, 'meta_fields', {})
+        meta_fields = getattr(meta, 'meta_fields', [])
         data = OrderedDict()
         for field_name in meta_fields:
             data.update({

rest_framework_json_api/serializers.py

@@ -150,10 +150,13 @@ def get_field_names(self, declared_fields, info):
         """
         meta_fields = getattr(self.Meta, 'meta_fields', None)
 
-        declared = OrderedDict()
-        for field_name in declared_fields.keys():
-            field = declared_fields[field_name]
-            if field_name not in meta_fields:
-                declared[field_name] = field
+        if meta_fields:
+            declared = OrderedDict()
+            for field_name in set(declared_fields.keys()):
+                field = declared_fields[field_name]
+                if field_name not in meta_fields:
+                    declared[field_name] = field
+        else:
+            declared = declared_fields
         return super(ModelSerializer, self).get_field_names(declared, info)