From 4345eb99895c1d6e46860ec9336b78ca5547c0a9 Mon Sep 17 00:00:00 2001
From: doctogonzo <doctogonzo@gmail.com>
Date: Tue, 5 May 2015 12:47:26 +0200
Subject: [PATCH] autosearch compleate: full name fix

---
 .../WebsitePanel_SharedResources.ascx.resx           | 12 ++++++++++++
 .../DesktopModules/WebsitePanel/SearchObject.ascx    | 10 ++++++----
 .../DesktopModules/WebsitePanel/SearchObject.ascx.cs |  8 ++++++++
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
index 61846104..5a2983e6 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
@@ -5274,6 +5274,18 @@
   <data name="ServiceItemType.VMInfo" xml:space="preserve">
     <value>Virtual Machine (Private Cloud)</value>
   </data>
+  <data name="UserItemType.Username" xml:space="preserve">
+    <value>Username</value>
+  </data>
+  <data name="UserItemType.Email" xml:space="preserve">
+    <value>E-mail</value>
+  </data>
+  <data name="UserItemType.CompanyName" xml:space="preserve">
+    <value>Company Name</value>
+  </data>
+  <data name="UserItemType.FullName" xml:space="preserve">
+    <value>Full Name</value>
+  </data>
   <data name="Error.WEB_PUB_DISABLE" xml:space="preserve">
     <value>Could not disable access to Web Publishing feature for the account specified</value>
   </data>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx
index c78b294f..315de47e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx
@@ -70,7 +70,7 @@
                 <a href="javascript: void(0)" onclick="CPopupDialog('mydialog',event)">Type</a>
             </HeaderTemplate>
             <ItemTemplate>
-                <%# Eval("ColumnType") %>
+                <%# GetTypeDisplayName((string)Eval("ColumnType")) %>
             </ItemTemplate>
         </asp:TemplateField>
 		<asp:TemplateField SortExpression="TextSearch" HeaderText="gvText" HeaderStyle-Wrap="false">
@@ -80,9 +80,11 @@
 	            </asp:hyperlink>
             </ItemTemplate>
 		</asp:TemplateField>
-		<asp:BoundField DataField="FullType" HtmlEncode="false" SortExpression="FullType" HeaderText="gvFullType">
-		    <HeaderStyle Wrap="false" />
-        </asp:BoundField>		
+		<asp:TemplateField SortExpression="FullType" HeaderText="gvFullType" HeaderStyle-Wrap="false">
+            <ItemTemplate>
+                <%# GetTypeDisplayName((string)Eval("FullType")) %>
+            </ItemTemplate>
+        </asp:TemplateField>		
 	</Columns>
 </asp:GridView>
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx.cs
index bb2f1bd9..6e17d9f1 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx.cs
@@ -6,6 +6,7 @@ using System.Web.UI;
 using System.Web.UI.WebControls;
 using System.Web.Script.Serialization;
 using WebsitePanel.WebPortal;
+using System.Xml;
 
 namespace WebsitePanel.Portal
 {
@@ -48,6 +49,13 @@ namespace WebsitePanel.Portal
             }
         }
 
+        protected string GetTypeDisplayName(string type)
+        {
+            return GetSharedLocalizedString("ServiceItemType." + type)
+                ?? GetSharedLocalizedString("UserItemType." + type)
+                ?? type;
+        }
+
         public string GetItemPageUrl(string fullType, string itemType, int itemId, int spaceId, int accountId)
         {
             string res = "";