Skip to content

Commit 3a597c8

Browse files
committed
Merge branch 'develop': v1.0.4
2 parents df470ea + 4b7802a commit 3a597c8

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
# built documents.
6262
#
6363
# The short X.Y version.
64-
version = "0.1"
64+
version = "1.0"
6565
# The full version, including alpha/beta/rc tags.
66-
release = "0.1"
66+
release = "1.0.4"
6767

6868
# The language for content autogenerated by Sphinx. Refer to documentation
6969
# for a list of supported languages.

docs/img/schema.png

11.4 KB
Loading

flask_combo_jsonapi/resource.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,10 @@ def post(self, *args, **kwargs):
188188

189189
obj = self.create_object(data, kwargs)
190190

191-
result = schema.dump(obj)
191+
if obj is None:
192+
result = {"data": None}
193+
else:
194+
result = schema.dump(obj)
192195

193196
if result["data"].get("links", {}).get("self"):
194197
final_result = (result, 201, {"Location": result["data"]["links"]["self"]})

flask_combo_jsonapi/schema.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def get_related_schema(schema, field):
140140
:param field: the relationship field
141141
:return Schema: the related schema
142142
"""
143-
return schema._declared_fields[field].__dict__['_Relationship__schema']
143+
return schema._declared_fields[field].schema
144144

145145

146146
def get_schema_from_type(resource_type):

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
from setuptools import setup, find_packages
33

4-
__version__ = "1.0.3"
4+
__version__ = "1.0.4"
55

66

77
requirements_filepath = os.path.join(os.path.dirname(__name__), "requirements.txt")

0 commit comments

Comments
 (0)