From edb0a934a1f03547e377d4878c6369fe50f66423 Mon Sep 17 00:00:00 2001 From: Marc Goodson Date: Sat, 4 Feb 2017 18:35:47 +0000 Subject: [PATCH 1/2] Fixes U4-9480 Allow more than one item from the dictionary object to be returned on the querystring --- .../src/common/services/umbrequesthelper.service.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js index a3d1e5b0c6..1f20ef5ca6 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js @@ -47,15 +47,17 @@ function umbRequestHelper($http, $q, umbDataFormatter, angularHelper, dialogServ return _.map(queryStrings, function (item) { var key = null; var val = null; + var encodedQueryStrings = []; + // can be multiple parameters passed via array for (var k in item) { key = k; val = item[k]; - break; - } + encodedQueryStrings.push(encodeURIComponent(key) + "=" + encodeURIComponent(val)); + } if (key === null || val === null) { throw "The object in the array was not formatted as a key/value pair"; - } - return encodeURIComponent(key) + "=" + encodeURIComponent(val); + } + return encodedQueryStrings.join("&"); }).join("&"); } else if (angular.isObject(queryStrings)) { From 78bc38fe1bd1b82dbfe68fb24b26c848abe02cac Mon Sep 17 00:00:00 2001 From: Marc Goodson Date: Sat, 4 Feb 2017 18:40:28 +0000 Subject: [PATCH 2/2] getUserLog and getLog don't have an id parameter these methods blow up when the api doesn't return because they referenced an id variable that does not exist --- .../src/common/resources/log.resource.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js index 8059975fc1..d74c7d82ac 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js @@ -68,7 +68,7 @@ function logResource($q, $http, umbRequestHelper) { "logApiBaseUrl", "GetCurrentUserLog", [{ logtype: type, sinceDate: since }])), - 'Failed to retrieve user data for id ' + id); + 'Failed to retrieve log data for current user of type ' + type + ' since ' + since); }, /** @@ -99,7 +99,7 @@ function logResource($q, $http, umbRequestHelper) { "logApiBaseUrl", "GetLog", [{ logtype: type, sinceDate: since }])), - 'Failed to retrieve user data for id ' + id); + 'Failed to retrieve log data of type ' + type + ' since ' + since); } }; }