Skip to content

Commit

Permalink
Merge pull request #69 from numberoverzero/dev
Browse files Browse the repository at this point in the history
Update docs so UserSchema _links point to correct routes
  • Loading branch information
sloria committed Dec 8, 2017
2 parents 58583e5 + 9dbbabe commit 7208b90
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
Changelog
=========

Unreleased
**********

* Updated documentation to fix example ``ma.URLFor`` target.

0.8.0 (2017-05-28)
******************

* Fix compatibility with marshmallow>=3.0.

Support:

* *Backwards-incompatible*: Drop support for marshmallow<=2.0.0.
* *Backwards-incompatible*: Drop support for marshmallow<=2.0.0.
* Test against Python 3.6.

0.7.0 (2016-06-28)
Expand Down
8 changes: 4 additions & 4 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ Define your output format with marshmallow.
fields = ('email', 'date_created', '_links')
# Smart hyperlinking
_links = ma.Hyperlinks({
'self': ma.URLFor('author_detail', id='<id>'),
'collection': ma.URLFor('authors')
'self': ma.URLFor('user_detail', id='<id>'),
'collection': ma.URLFor('users')
})
user_schema = UserSchema()
Expand All @@ -77,8 +77,8 @@ Output the data in your views.
# "email": "fred@queen.com",
# "date_created": "Fri, 25 Apr 2014 06:02:56 -0000",
# "_links": {
# "self": "/api/authors/42",
# "collection": "/api/authors/"
# "self": "/api/users/42",
# "collection": "/api/users/"
# }
# }
Expand Down
8 changes: 4 additions & 4 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ Define your output format with marshmallow.
fields = ('email', 'date_created', '_links')
# Smart hyperlinking
_links = ma.Hyperlinks({
'self': ma.URLFor('author_detail', id='<id>'),
'collection': ma.URLFor('authors')
'self': ma.URLFor('user_detail', id='<id>'),
'collection': ma.URLFor('users')
})
user_schema = UserSchema()
Expand All @@ -81,8 +81,8 @@ Output the data in your views.
# "email": "fred@queen.com",
# "date_created": "Fri, 25 Apr 2014 06:02:56 -0000",
# "_links": {
# "self": "/api/authors/42",
# "collection": "/api/authors/"
# "self": "/api/users/42",
# "collection": "/api/users/"
# }
# }
Expand Down

0 comments on commit 7208b90

Please sign in to comment.