From 40ea54007fab4e08e540cbf3444064da703a22d1 Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Wed, 18 Jan 2017 12:34:58 +0000
Subject: [PATCH] Update the usage of GetUrl - to just use the raw string value
 as opposed to a JSON object. Updated related JS object mock as well

---
 .../src/common/mocks/resources/entity.mocks.js            | 8 ++------
 .../contentpicker/contentpicker.controller.js             | 3 ++-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/entity.mocks.js b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/entity.mocks.js
index a98240111e..8c03679183 100644
--- a/src/Umbraco.Web.UI.Client/src/common/mocks/resources/entity.mocks.js
+++ b/src/Umbraco.Web.UI.Client/src/common/mocks/resources/entity.mocks.js
@@ -38,12 +38,8 @@ angular.module('umbraco.mocks').
           if (!mocksUtils.checkAuth()) {
               return [401, null, null];
           }
-          
-          var urlOrbject = {
-              "url": "url"
-          };
 
-          return [200, urlOrbject, null];
+          return [200, "url", null];
 
       }
 
@@ -61,7 +57,7 @@ angular.module('umbraco.mocks').
               $httpBackend
                   .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Entity/GetById?'))
                   .respond(returnEntitybyId);
-
+            
             $httpBackend
                   .whenGET(mocksUtils.urlRegex('/umbraco/UmbracoApi/Entity/GetUrl?'))
                     .respond(returnEntityUrl);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
index 22312511ce..d39027e014 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
@@ -254,7 +254,8 @@ function contentPickerController($scope, entityResource, editorState, iconHelper
         if(entityType !== "Member") {
             entityResource.getUrl(entity.id, entityType).then(function(data){
                 // update url
-                entity.url = data.url;
+                entity.url = data;
+
                 // push item to render model
                 addSelectedItem(entity);
             });