From 6f39f190a464913538959ffd1aee67e48e5fdb8b Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Thu, 10 Oct 2013 13:33:25 +0200
Subject: [PATCH] Adds guid to entitybasic

---
 .../src/common/resources/entity.resource.js          |  2 +-
 .../src/views/directives/umb-navigation.html         |  2 +-
 src/Umbraco.Web/Editors/EntityController.cs          | 12 +-----------
 src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs |  3 +++
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
index a23697344b..e008f3b69f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
+++ b/src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
@@ -95,7 +95,7 @@ function entityResource($q, $http, umbRequestHelper) {
                    umbRequestHelper.getApiUrl(
                        "entityApiBaseUrl",
                        "GetById",
-                       [{ id: id, type: type }])),
+                       [{ id: id}, {type: type }])),
                'Failed to retreive entity data for id ' + id);
         },
         
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html b/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html
index 6eeda7426c..454f8cb82c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html
+++ b/src/Umbraco.Web.UI.Client/src/views/directives/umb-navigation.html
@@ -37,7 +37,7 @@
                         <ul class="umb-search-group" ng-repeat="resultGroup in nav.ui.search.results">
                             <li ng-repeat="result in resultGroup.matches">
                                 <div style="padding-left: 20px">
-                                <a ng-class="{'first':$first}" ng-href="#/{{resultGroup.editor}}{{result.id}}">
+                                <a ng-class="{'first':$first}" ng-href="#/{{resultGroup.editor}}{{result.Id}}">
 
                                        <i class="icon umb-tree-icon sprTree {{resultGroup.icon}}" style="height: 100%"></i>
                                             {{result.title}}
diff --git a/src/Umbraco.Web/Editors/EntityController.cs b/src/Umbraco.Web/Editors/EntityController.cs
index bc5c52acf1..64f79b5355 100644
--- a/src/Umbraco.Web/Editors/EntityController.cs
+++ b/src/Umbraco.Web/Editors/EntityController.cs
@@ -40,17 +40,6 @@ namespace Umbraco.Web.Editors
                 return null;
 
             return ExamineSearch(query, type);
-
-            /*
-            switch (type)
-            {
-                case UmbracoEntityTypes.Document:
-                    
-                case UmbracoEntityTypes.Media:
-                    return ExamineSearch(query, UmbracoEntityType);
-                default:
-                    throw new NotSupportedException("The " + typeof(EntityController) + " currently does not support searching against object type " + type);
-            }*/
         }
 
         /// <summary>
@@ -107,6 +96,7 @@ namespace Umbraco.Web.Editors
                 case UmbracoEntityTypes.Member:
                     searcher = Constants.Examine.InternalMemberSearcher;
                     type = "member";
+                    fields = new[] { "id", "email", "login","name", "nodename"};
                     break;
                 case UmbracoEntityTypes.Media:
                     type = "media";
diff --git a/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs b/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
index d07955060f..8c3513e6e1 100644
--- a/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
@@ -23,6 +23,9 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "icon")]
         public string Icon { get; set; }
 
+        [DataMember(Name = "key")]
+        public Guid Key { get; set; }
+
         [DataMember(Name = "parentId", IsRequired = true)]
         [Required]
         public int ParentId { get; set; }