yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes an issue with missing _key in member search

Browse Source
This commit is contained in:
perploug
2013-10-29 22:10:56 +01:00
parent a7f5576fee
commit d8a8556598
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/views/common/dialogs/memberpicker.controller.js
View File

@@ -1,6 +1,6 @@
//used for the member picker dialog
angular.module("umbraco").controller("Umbraco.Dialogs.MemberPickerController",
function($scope, eventsService, searchService, $log) {
function($scope, eventsService, entityResource, searchService, $log) {
var dialogOptions = $scope.$parent.dialogOptions;
$scope.dialogTreeEventHandler = $({});
$scope.results = [];

2
src/Umbraco.Web/Editors/EntityController.cs
View File

@@ -226,7 +226,7 @@ namespace Umbraco.Web.Editors
{
m.AdditionalData["Email"] = results.First(x => x.Id.ToInvariantString() == m.Id.ToString()).Fields["email"];
}
if (searchResult.Fields["__key"] != null)
if (searchResult.Fields.ContainsKey("__key") && searchResult.Fields["__key"] != null)
{
Guid key;
if (Guid.TryParse(searchResult.Fields["__key"], out key))