diff --git a/core/drf_api.py b/core/drf_api.py index a47baa1..b5b58c7 100644 --- a/core/drf_api.py +++ b/core/drf_api.py @@ -92,10 +92,8 @@ class PinSerializer(serializers.HyperlinkedModelSerializer): "image_by_id", "tags", ) - extra_kwargs = { - "submitter": {"read_only": True}, - } + submitter = UserSerializer(read_only=True) tags = TagSerializer( many=True, source="tag_list", diff --git a/pinry/static/js/helpers.js b/pinry/static/js/helpers.js index 74f3d41..88d8ac8 100644 --- a/pinry/static/js/helpers.js +++ b/pinry/static/js/helpers.js @@ -5,6 +5,7 @@ * Updated: Feb 26th, 2013 * Require: jQuery */ +var API_BASE = "/api/v2/"; function _getCookie(name) { @@ -60,15 +61,8 @@ function cleanTags(tags) { return tags; } - -function getImageData(imageId) { - var apiUrl = '/api/v1/image/'+imageId+'/?format=json'; - return $.get(apiUrl); -} - - function getPinData(pinId) { - var apiUrl = '/api/v1/pin/'+pinId+'/?format=json'; + var apiUrl = API_BASE + "pins/" + pinId + '/?format=json'; return $.get(apiUrl); } diff --git a/pinry/static/js/pin-form.js b/pinry/static/js/pin-form.js index 406868b..a414e12 100644 --- a/pinry/static/js/pin-form.js +++ b/pinry/static/js/pin-form.js @@ -9,8 +9,6 @@ $(window).load(function() { - var api_base = "/api/v2/"; - var uploadedImage = false; var editedPin = null; @@ -101,7 +99,7 @@ $(window).load(function() { } // Drag and drop upload $('#pin-form-image-upload').dropzone({ - url: api_base + "images/", + url: API_BASE + "images/", paramName: 'image', parallelUploads: 1, uploadMultiple: false,