diff options
| author | Jessica Tallon <jessica@megworld.co.uk> | 2014-07-12 08:42:39 +0100 |
|---|---|---|
| committer | Jessica Tallon <jessica@megworld.co.uk> | 2014-07-22 23:13:16 +0100 |
| commit | 3c8bd177b24cbc53dba9ebc8a03f83370e409c4f (patch) | |
| tree | 405725bf60c102adda37616128a8f368c7d56c5e /mediagoblin/federation | |
| parent | 51ab51921e5104f1b71402d38928651562c7134a (diff) | |
| download | mediagoblin-3c8bd177b24cbc53dba9ebc8a03f83370e409c4f.tar.lz mediagoblin-3c8bd177b24cbc53dba9ebc8a03f83370e409c4f.tar.xz mediagoblin-3c8bd177b24cbc53dba9ebc8a03f83370e409c4f.zip | |
Add test for API object endpoint
Diffstat (limited to 'mediagoblin/federation')
| -rw-r--r-- | mediagoblin/federation/routing.py | 2 | ||||
| -rw-r--r-- | mediagoblin/federation/views.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/federation/routing.py b/mediagoblin/federation/routing.py index b9cc4e2e..544edc68 100644 --- a/mediagoblin/federation/routing.py +++ b/mediagoblin/federation/routing.py @@ -51,7 +51,7 @@ add_route( # object endpoints add_route( "mediagoblin.federation.object", - "/api/<string:objectType>/<string:uuid>", + "/api/<string:objectType>/<string:slug>", "mediagoblin.federation.views:object" ) add_route( diff --git a/mediagoblin/federation/views.py b/mediagoblin/federation/views.py index c2b02ec0..af81cbcb 100644 --- a/mediagoblin/federation/views.py +++ b/mediagoblin/federation/views.py @@ -275,16 +275,16 @@ def feed(request): def object(request, raw_obj=False): """ Lookup for a object type """ object_type = request.matchdict["objectType"] - uuid = request.matchdict["uuid"] + slug = request.matchdict["slug"] if object_type not in ["image"]: error = "Unknown type: {0}".format(object_type) # not sure why this is 404, maybe ask evan. Maybe 400? return json_response({"error": error}, status=404) - media = MediaEntry.query.filter_by(slug=uuid).first() + media = MediaEntry.query.filter_by(slug=slug).first() if media is None: # no media found with that uuid - error = "Can't find a {0} with ID = {1}".format(object_type, uuid) + error = "Can't find a {0} with ID = {1}".format(object_type, slug) return json_response({"error": error}, status=404) if raw_obj: |