From 23cce8216d7d58128afeff4607d08fef44f73ab8 Mon Sep 17 00:00:00 2001
From: alexY <devnull@localhost>
Date: Wed, 29 Apr 2015 13:29:08 +0300
Subject: [PATCH 1/3] Global search autocomplete should open concrete object if
 selected from list.

---
 .../WebsitePanel/Code/Helpers/AjaxHandler.cs  |  4 +
 .../SkinControls/GlobalSearch.ascx            | 20 +++++
 .../SkinControls/GlobalSearch.ascx.cs         | 89 ++++++++++++++++---
 .../GlobalSearch.ascx.designer.cs             | 18 ++++
 4 files changed, 118 insertions(+), 13 deletions(-)

diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs
index ce3a6e51..23024756 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs
@@ -32,6 +32,8 @@ namespace WebsitePanel.WebPortal
                     Dictionary<string, string> obj = new Dictionary<string, string>();
                     obj["ColumnType"] = "PackageName";
                     obj["TextSearch"] = row["PackageName"].ToString();
+                    obj["ItemID"] = row["ItemID"].ToString();
+                    obj["PackageID"] = row["PackageID"].ToString();
                     obj["FullType"] = "Space";
                     dataList.Add(obj);
                 }
@@ -54,6 +56,8 @@ namespace WebsitePanel.WebPortal
                     Dictionary<string, string> obj = new Dictionary<string, string>();
                     obj["ColumnType"] = row["ColumnType"].ToString();
                     obj["TextSearch"] = row["TextSearch"].ToString();
+                    obj["ItemID"] = row["ItemID"].ToString();
+                    obj["PackageID"] = row["PackageID"].ToString();
                     obj["FullType"] = row["FullType"].ToString();
                     dataList.Add(obj);
                 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx
index 51e3e0af..ad36f998 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx
@@ -6,6 +6,12 @@
 
 <script type="text/javascript">
     //<![CDATA[
+    $("#<%= tbSearch.ClientID %>").keypress(function () {
+        $("#<%= tbSearchText.ClientID %>").val('');
+        $("#<%= tbObjectId.ClientID %>").val('');
+        $("#<%= tbPackageId.ClientID %>").val('');
+    });
+
     $(document).ready(function () {
         $("#<%= tbSearch.ClientID %>").autocomplete({
             zIndex: 100,
@@ -33,6 +39,8 @@
                 $("#<%= tbSearchColumnType.ClientID %>").val(item.code.ColumnType);
                 $("#<%= tbSearchFullType.ClientID %>").val(item.code.FullType);
                 $("#<%= tbSearchText.ClientID %>").val(item.code.TextSearch);
+                $("#<%= tbObjectId.ClientID %>").val(item.code.ItemID);
+                $("#<%= tbPackageId.ClientID %>").val(item.code.PackageID);
             }
         });
     });//]]>
@@ -70,6 +78,18 @@
                             type="hidden"
                         >
                         </asp:TextBox>
+                        <asp:TextBox
+                            ID="tbObjectId"
+                            runat="server"
+                            type="hidden"
+                        >
+                        </asp:TextBox>
+                        <asp:TextBox
+                            ID="tbPackageId"
+                            runat="server"
+                            type="hidden"
+                        >
+                        </asp:TextBox>
 
                         <asp:ImageButton
                             ID="ImageButton1"
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.cs
index db40d03c..3de1b7b4 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.cs
@@ -44,6 +44,13 @@ namespace WebsitePanel.Portal.SkinControls
 {
     public partial class GlobalSearch : WebsitePanelControlBase
     {
+        const string TYPE_WEBSITE = "WebSite";
+        const string TYPE_DOMAIN = "Domain";
+        const string TYPE_ORGANIZATION = "Organization";
+        const string PID_SPACE_WEBSITES = "SpaceWebSites";
+        const string PID_SPACE_DIMAINS = "SpaceDomains";
+        const string PID_SPACE_EXCHANGESERVER = "SpaceExchangeServer";
+
         class Tab
         {
             int index;
@@ -115,6 +122,41 @@ namespace WebsitePanel.Portal.SkinControls
                 "ItemTypeID=" + ddlItemType.SelectedValue)); */
         }
 
+        public string GetItemPageUrl(string fullType, string itemType, int itemId, int spaceId)
+        {
+            string res = "";
+            if (fullType.Equals("Users"))
+            {
+                res = PortalUtils.GetUserHomePageUrl(itemId);
+            }
+            else
+            {
+                switch (itemType)
+                {
+                    case TYPE_WEBSITE:
+                        res = PortalUtils.NavigatePageURL(PID_SPACE_WEBSITES, "ItemID", itemId.ToString(),
+                            PortalUtils.SPACE_ID_PARAM + "=" + spaceId, "ctl=edit_item",
+                            "moduleDefId=websites");
+                        break;
+                    case TYPE_DOMAIN:
+                        res = PortalUtils.NavigatePageURL(PID_SPACE_DIMAINS, "DomainID", itemId.ToString(),
+                            PortalUtils.SPACE_ID_PARAM + "=" + spaceId, "ctl=edit_item",
+                            "moduleDefId=domains");
+                        break;
+                    case TYPE_ORGANIZATION:
+                        res = PortalUtils.NavigatePageURL(PID_SPACE_EXCHANGESERVER, "ItemID", itemId.ToString(),
+                            PortalUtils.SPACE_ID_PARAM + "=" + spaceId, "ctl=edit_item",
+                            "moduleDefId=ExchangeServer");
+                        break;
+                    default:
+                        res = PortalUtils.GetSpaceHomePageUrl(itemId);
+                        break;
+                }
+            }
+
+            return res;
+        }
+
         //TODO START
         protected void btnSearchObject_Click(object sender, EventArgs e)
         {
@@ -125,25 +167,46 @@ namespace WebsitePanel.Portal.SkinControls
             {
                 if (strFullType == "Users")
                 {
-                    Response.Redirect(PortalUtils.NavigatePageURL(PortalUtils.GetUsersSearchPageId(),
-                       PortalUtils.USER_ID_PARAM, PanelSecurity.SelectedUserId.ToString(),
-                        "Query=" + Server.UrlEncode(strText),
-                        "Criteria=" + Server.UrlEncode(strColumnType)
-                    ));
+                    if (tbObjectId.Text.Length > 0)
+                    {
+                        Response.Redirect(PortalUtils.GetUserHomePageUrl(Int32.Parse(tbObjectId.Text)));
+                    }
+                    else
+                    {
+                        Response.Redirect(PortalUtils.NavigatePageURL(PortalUtils.GetUsersSearchPageId(),
+                           PortalUtils.USER_ID_PARAM, PanelSecurity.SelectedUserId.ToString(),
+                            "Query=" + Server.UrlEncode(strText),
+                            "Criteria=" + Server.UrlEncode(strColumnType)
+                        ));
+                    }
                 }
                 else if (strFullType == "Space")
                 {
-                    Response.Redirect(PortalUtils.NavigatePageURL(PortalUtils.GetSpacesSearchPageId(),
-                        PortalUtils.USER_ID_PARAM, PanelSecurity.SelectedUserId.ToString(),
-                        "Query=" + Server.UrlEncode(strText),
-                        "Criteria=" + Server.UrlEncode(strColumnType)
-                    ));
+                    if (tbObjectId.Text.Length > 0)
+                    {
+                        Response.Redirect(GetItemPageUrl(strFullType,tbSearchColumnType.Text,Int32.Parse(tbObjectId.Text),Int32.Parse(tbPackageId.Text)));
+                    }
+                    else
+                    {
+                        Response.Redirect(PortalUtils.NavigatePageURL(PortalUtils.GetSpacesSearchPageId(),
+                            PortalUtils.USER_ID_PARAM, PanelSecurity.SelectedUserId.ToString(),
+                            "Query=" + Server.UrlEncode(strText),
+                            "Criteria=" + Server.UrlEncode(strColumnType)
+                        ));
+                    }
                 }
                 else
                 {
-                    Response.Redirect(PortalUtils.NavigatePageURL(PortalUtils.GetObjectSearchPageId(),
-                        PortalUtils.USER_ID_PARAM, PanelSecurity.SelectedUserId.ToString(),
-                        "Query=" + Server.UrlEncode(strText)));
+                    if (tbObjectId.Text.Length > 0)
+                    {
+                        Response.Redirect(GetItemPageUrl(strFullType, tbSearchColumnType.Text, Int32.Parse(tbObjectId.Text), Int32.Parse(tbPackageId.Text)));
+                    }
+                    else
+                    {
+                        Response.Redirect(PortalUtils.NavigatePageURL(PortalUtils.GetObjectSearchPageId(),
+                            PortalUtils.USER_ID_PARAM, PanelSecurity.SelectedUserId.ToString(),
+                            "Query=" + Server.UrlEncode(strText)));
+                    }
                 }
             }
             else
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.designer.cs
index 1fc6e519..e549b9d0 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.designer.cs
@@ -57,6 +57,24 @@ namespace WebsitePanel.Portal.SkinControls {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox tbSearchText;
         
+        /// <summary>
+        /// tbObjectId control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox tbObjectId;
+        
+        /// <summary>
+        /// tbPackageId control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox tbPackageId;
+        
         /// <summary>
         /// ImageButton1 control.
         /// </summary>

From 4372ee7db04103271ee3faf2d282d3e986010137 Mon Sep 17 00:00:00 2001
From: alexY <devnull@localhost>
Date: Wed, 29 Apr 2015 15:54:20 +0300
Subject: [PATCH 2/3] Search button should take to item if selected from
 autocomplete

---
 WebsitePanel/Database/update_db.sql           | 11 +++++-
 .../PackagesProxy.cs                          |  5 +--
 .../Data/DataProvider.cs                      |  5 +--
 .../Packages/PackageController.cs             |  4 +--
 .../esPackages.asmx.cs                        |  4 +--
 .../WebsitePanel/Code/Helpers/AjaxHandler.cs  | 19 ++++++-----
 .../Code/Helpers/PackagesHelper.cs            | 10 +++---
 .../WebsitePanel/SearchObject.ascx            |  2 ++
 .../SkinControls/GlobalSearch.ascx            | 15 ++++----
 .../GlobalSearch.ascx.designer.cs             |  2 +-
 .../WebsitePanel/UserControls/SearchBox.ascx  | 34 +++++++++++++++----
 .../UserControls/SearchBox.ascx.cs            | 25 +++++++++++---
 .../UserControls/SearchBox.ascx.designer.cs   | 18 ++++++++++
 .../WebsitePanel.Portal.Modules.csproj        |  1 -
 14 files changed, 114 insertions(+), 41 deletions(-)

diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 7598159f..4ce245d3 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -10689,6 +10689,7 @@ GO
 
 IF EXISTS (SELECT * FROM SYS.OBJECTS WHERE type = 'P' AND name = 'GetSearchObject')
 DROP PROCEDURE GetSearchObject
+GO
 
 CREATE PROCEDURE [dbo].[GetSearchObject]
 (
@@ -10892,7 +10893,11 @@ IF @SortColumn <> '' AND @SortColumn IS NOT NULL
 SET @sqlReturn = @sqlReturn + ' ORDER BY ' + @SortColumn + ' '
 SET @sqlReturn = @sqlReturn + '
 SELECT COUNT(ItemID) FROM @ItemsReturn;
-SELECT DISTINCT(ColumnType) FROM @ItemsReturn;
+SELECT DISTINCT(ColumnType) FROM @ItemsReturn WHERE (1 = 1) ';
+IF @FullType <> ''
+SET @sqlReturn = @sqlReturn + ' AND FullType = ''' + @FullType + '''';
+SET @sqlReturn = @sqlReturn + '; ';
+SET @sqlReturn = @sqlReturn + '
 SELECT ItemPosition, ItemID, TextSearch, ColumnType, FullType, PackageID
 FROM @ItemsReturn AS IR WHERE (1 = 1)
 '
@@ -10903,6 +10908,9 @@ SET @sqlReturn = @sqlReturn + ' AND IR.ItemPosition BETWEEN @StartRow AND @EndRo
 IF @ColType <> ''
 SET @sqlReturn = @sqlReturn + ' AND ColumnType in ( ' + @ColType + ' ) ';
 
+IF @FullType <> ''
+SET @sqlReturn = @sqlReturn + ' AND FullType = ''' + @FullType + '''';
+
 exec sp_executesql @sqlReturn, N'@StartRow int, @MaximumRows int, @FilterValue nvarchar(50), @curSpaceValue cursor, @curUsersValue cursor',
 @StartRow, @MaximumRows, @FilterValue, @curSpace, @curUsers
 
@@ -10911,3 +10919,4 @@ DEALLOCATE @curSpace
 CLOSE @curUsers
 DEALLOCATE @curUsers
 RETURN
+
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/PackagesProxy.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/PackagesProxy.cs
index 54603503..0791687f 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/PackagesProxy.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Client/PackagesProxy.cs
@@ -910,7 +910,7 @@ namespace WebsitePanel.EnterpriseServer {
         /// <remarks/>
         /// //TODO START
         [System.Web.Services.Protocols.SoapDocumentMethodAttribute("http://smbsaas/websitepanel/enterpriseserver/GetSearchObject", RequestNamespace = "http://smbsaas/websitepanel/enterpriseserver", ResponseNamespace = "http://smbsaas/websitepanel/enterpriseserver", Use = System.Web.Services.Description.SoapBindingUse.Literal, ParameterStyle = System.Web.Services.Protocols.SoapParameterStyle.Wrapped)]
-        public System.Data.DataSet GetSearchObject(int userId, string filterColumn, string filterValue, int statusId, int roleId, string sortColumn, int startRow, int maximumRows, string colType)
+        public System.Data.DataSet GetSearchObject(int userId, string filterColumn, string filterValue, int statusId, int roleId, string sortColumn, int startRow, int maximumRows, string colType, string fullType)
         {
             object[] results = this.Invoke("GetSearchObject", new object[] {
                         userId,
@@ -921,7 +921,8 @@ namespace WebsitePanel.EnterpriseServer {
                         sortColumn,
                         startRow,
                         maximumRows,
-                        colType
+                        colType,
+                        fullType
             });
             return ((System.Data.DataSet)(results[0]));
         }
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
index 23a0578e..68a81036 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Data/DataProvider.cs
@@ -141,7 +141,7 @@ namespace WebsitePanel.EnterpriseServer
 
         //TODO START
         public static DataSet GetSearchObject(int actorId, int userId, string filterColumn, string filterValue,
-           int statusId, int roleId, string sortColumn, int startRow, int maximumRows, string colType, bool recursive)
+           int statusId, int roleId, string sortColumn, int startRow, int maximumRows, string colType, string fullType, bool recursive)
         {
             return SqlHelper.ExecuteDataset(ConnectionString, CommandType.StoredProcedure,
                 ObjectQualifier + "GetSearchObject",
@@ -155,7 +155,8 @@ namespace WebsitePanel.EnterpriseServer
                 new SqlParameter("@startRow", startRow),
                 new SqlParameter("@maximumRows", maximumRows),
                 new SqlParameter("@recursive", recursive),
-                new SqlParameter("@ColType", colType));
+                new SqlParameter("@ColType", colType),
+                new SqlParameter("@FullType", fullType));
         }
 
         //TODO END
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
index ccd2e736..1c920bda 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/Packages/PackageController.cs
@@ -319,10 +319,10 @@ namespace WebsitePanel.EnterpriseServer
 
         //TODO START
         public static DataSet GetSearchObject(int userId, string filterColumn, string filterValue,
-            int statusId, int roleId, string sortColumn, int startRow, int maximumRows, string colType)
+            int statusId, int roleId, string sortColumn, int startRow, int maximumRows, string colType, string fullType)
         {
             return DataProvider.GetSearchObject(SecurityContext.User.UserId, userId,
-                filterColumn, filterValue, statusId, roleId, sortColumn, startRow, maximumRows, colType, false);
+                filterColumn, filterValue, statusId, roleId, sortColumn, startRow, maximumRows, colType, fullType, false);
         }
         //TODO END
 
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esPackages.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esPackages.asmx.cs
index 9d9a6b52..36804d26 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esPackages.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esPackages.asmx.cs
@@ -138,9 +138,9 @@ namespace WebsitePanel.EnterpriseServer
 
         [WebMethod]
         public DataSet GetSearchObject(int userId, string filterColumn, string filterValue,
-            int statusId, int roleId, string sortColumn, int startRow, int maximumRows, string colType)
+            int statusId, int roleId, string sortColumn, int startRow, int maximumRows, string colType, string fullType)
         {
-            return PackageController.GetSearchObject(userId, filterColumn, filterValue, statusId, roleId, sortColumn, startRow, maximumRows, colType);
+            return PackageController.GetSearchObject(userId, filterColumn, filterValue, statusId, roleId, sortColumn, startRow, maximumRows, colType, fullType);
         }
         //TODO END
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs
index 23024756..fe3592d0 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs
@@ -47,19 +47,22 @@ namespace WebsitePanel.WebPortal
             {
                 DataSet dsObjectItems = ES.Services.Packages.GetSearchObject(PanelSecurity.EffectiveUserId, null,
                     String.Format("%{0}%", filterValue),
-                   0, 0, "", 0, 100, columnType);
+                   0, 0, "", 0, 100, columnType,fullType);
                 DataTable dt = dsObjectItems.Tables[2];
                 List<Dictionary<string, string>> dataList = new List<Dictionary<string, string>>();
                 for (int i = 0; i < dt.Rows.Count; ++i)
                 {
                     DataRow row = dt.Rows[i];
-                    Dictionary<string, string> obj = new Dictionary<string, string>();
-                    obj["ColumnType"] = row["ColumnType"].ToString();
-                    obj["TextSearch"] = row["TextSearch"].ToString();
-                    obj["ItemID"] = row["ItemID"].ToString();
-                    obj["PackageID"] = row["PackageID"].ToString();
-                    obj["FullType"] = row["FullType"].ToString();
-                    dataList.Add(obj);
+                    if ((fullType == null) || (fullType.Length == 0) || (fullType == row["FullType"].ToString()))
+                    {
+                        Dictionary<string, string> obj = new Dictionary<string, string>();
+                        obj["ColumnType"] = row["ColumnType"].ToString();
+                        obj["TextSearch"] = row["TextSearch"].ToString();
+                        obj["ItemID"] = row["ItemID"].ToString();
+                        obj["PackageID"] = row["PackageID"].ToString();
+                        obj["FullType"] = row["FullType"].ToString();
+                        dataList.Add(obj);
+                    }
                 }
 
                 var jsonSerialiser = new JavaScriptSerializer();
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/PackagesHelper.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/PackagesHelper.cs
index eac0381f..7067bd4c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/PackagesHelper.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/PackagesHelper.cs
@@ -250,25 +250,25 @@ namespace WebsitePanel.Portal
         #region Service Items Paged Search
         DataSet dsObjectItemsPaged;
 
-        public int SearchObjectItemsPagedCount(string filterColumn, string filterValue, string colType)
+        public int SearchObjectItemsPagedCount(string filterColumn, string filterValue, string fullType, string colType)
         {
             return (int)dsObjectItemsPaged.Tables[0].Rows[0][0];
         }
 
         public DataTable SearchObjectItemsPaged(int maximumRows, int startRowIndex, string sortColumn,
-            string filterColumn, string filterValue, string colType)
+            string filterColumn, string filterValue, string colType, string fullType)
         {
             dsObjectItemsPaged = ES.Services.Packages.GetSearchObject(PanelSecurity.EffectiveUserId, filterColumn,
                 String.Format("%{0}%", filterValue),
-                0, 0, sortColumn, startRowIndex, maximumRows, colType);
+                0, 0, sortColumn, startRowIndex, maximumRows, colType, fullType);
             return dsObjectItemsPaged.Tables[2];
         }
 
-        public DataTable SearchObjectTypes(string filterColumn, string filterValue, string sortColumn)
+        public DataTable SearchObjectTypes(string filterColumn, string filterValue, string fullType, string sortColumn)
         {
             dsObjectItemsPaged = ES.Services.Packages.GetSearchObject(PanelSecurity.EffectiveUserId, filterColumn,
                 String.Format("%{0}%", filterValue),
-                0, 0, sortColumn, 0, 0, "");
+                0, 0, sortColumn, 0, 0, "",fullType);
             return dsObjectItemsPaged.Tables[1];
         }
         //TODO END
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx
index 5defa1d4..8a29c88c 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx
@@ -91,6 +91,7 @@
     <SelectParameters>
         <asp:QueryStringParameter Name="filterColumn" QueryStringField="Criteria" />
         <asp:QueryStringParameter Name="filterValue" QueryStringField="Query" />
+        <asp:QueryStringParameter Name="fullType" QueryStringField="FullType" />
     </SelectParameters>
 </asp:ObjectDataSource>
 
@@ -99,6 +100,7 @@
     <SelectParameters>
         <asp:QueryStringParameter Name="filterColumn" QueryStringField="Criteria" />
         <asp:QueryStringParameter Name="filterValue" QueryStringField="Query" />
+        <asp:QueryStringParameter Name="fullType" QueryStringField="FullType" />
     </SelectParameters>
 </asp:ObjectDataSource>
 
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx
index ad36f998..e92cf5c7 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx
@@ -6,10 +6,12 @@
 
 <script type="text/javascript">
     //<![CDATA[
-    $("#<%= tbSearch.ClientID %>").keypress(function () {
-        $("#<%= tbSearchText.ClientID %>").val('');
-        $("#<%= tbObjectId.ClientID %>").val('');
-        $("#<%= tbPackageId.ClientID %>").val('');
+    $("#<%= tbSearch.ClientID %>").keypress(function (e) {
+        if (e.keyCode != 13) { // VK_RETURN
+            $("#<%= tbSearchText.ClientID %>").val('');
+            $("#<%= tbObjectId.ClientID %>").val('');
+            $("#<%= tbPackageId.ClientID %>").val('');
+        }
     });
 
     $(document).ready(function () {
@@ -41,12 +43,13 @@
                 $("#<%= tbSearchText.ClientID %>").val(item.code.TextSearch);
                 $("#<%= tbObjectId.ClientID %>").val(item.code.ItemID);
                 $("#<%= tbPackageId.ClientID %>").val(item.code.PackageID);
+                $("#<%= ImageButton1.ClientID %>").trigger("click");
             }
         });
     });//]]>
 </script>
 
-<asp:UpdatePanel runat="server" ID="updatePanelUsers" UpdateMode="Conditional" ChildrenAsTriggers="true">
+<asp:Panel runat="server" ID="updatePanelUsers" UpdateMode="Conditional" ChildrenAsTriggers="true">
     <ContentTemplate>
         <table cellpadding="0" cellspacing="0" align="right">
             <tr>
@@ -104,4 +107,4 @@
             </tr>
         </table>
     </ContentTemplate>
-</asp:UpdatePanel>
+</asp:Panel>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.designer.cs
index e549b9d0..df1febe1 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx.designer.cs
@@ -19,7 +19,7 @@ namespace WebsitePanel.Portal.SkinControls {
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.UpdatePanel updatePanelUsers;
+        protected global::System.Web.UI.WebControls.Panel updatePanelUsers;
         
         /// <summary>
         /// tbSearch control.
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SearchBox.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SearchBox.ascx
index f6e0b76f..4a9ede81 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SearchBox.ascx
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SearchBox.ascx
@@ -3,8 +3,12 @@
 <script type="text/javascript">
     //<![CDATA[
     $(document).ready(function () {
-        $("#tbSearch").keypress(function () {
-            $("#tbSearchText").val('');
+        $("#tbSearch").keypress(function (e) {
+            if (e.keyCode != 13) { // VK_RETURN
+                $("#tbSearchText").val('');
+                $("#tbObjectId").val('');
+                $("#tbPackageId").val('');
+            }
         });
 
         $("#tbSearch").autocomplete({
@@ -15,14 +19,14 @@
                     dataType: "json",
                     data: {
                         term: request.term,
-                        fullType: '',
-                        columnType: "'" + $("#ddlFilterColumn").val() + "'"
+                        fullType: 'Users'
+//                        columnType: "'" + $("#ddlFilterColumn").val() + "'"
                     },
                     url: "AjaxHandler.ashx",
                     success: function (data) {
                         response($.map(data, function (item) {
                             return {
-                                label: item.TextSearch,
+                                label: item.TextSearch + " [" + item.ColumnType + "]",
                                 code: item
                             };
                         }));
@@ -34,6 +38,9 @@
                 $("#ddlFilterColumn").val(item.code.ColumnType);
                 $("#tbSearchFullType").val(item.code.FullType);
                 $("#tbSearchText").val(item.code.TextSearch);
+                $("#tbObjectId").val(item.code.ItemID);
+                $("#tbPackageId").val(item.code.PackageID);
+                $("#<%= cmdSearch.ClientID %>").trigger("click");
             }
         });
     });//]]>
@@ -45,7 +52,7 @@
    <table>
         <tr>
             <td>
-                <asp:DropDownList ClientIDMode="Static" ID="ddlFilterColumn" runat="server" CssClass="NormalTextBox" resourcekey="ddlFilterColumn">
+                <asp:DropDownList ClientIDMode="Static" ID="ddlFilterColumn" runat="server" CssClass="NormalTextBox" resourcekey="ddlFilterColumn" style="display:none">
                 </asp:DropDownList>
             </td>
             <td>
@@ -76,7 +83,20 @@
                                     type="hidden"
                                 >
                                 </asp:TextBox>
-
+                                <asp:TextBox
+                                    ID="tbObjectId"
+                                    ClientIDMode="Static"
+                                    runat="server"
+                                    type="hidden"
+                                >
+                                </asp:TextBox>
+                                <asp:TextBox
+                                    ID="tbPackageId"
+                                    ClientIDMode="Static"
+                                    runat="server"
+                                    type="hidden"
+                                >
+                                </asp:TextBox>
                                 <asp:ImageButton
                                     ID="cmdSearch"
                                     runat="server"
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SearchBox.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SearchBox.ascx.cs
index 8b98b4f5..fe641c3e 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SearchBox.ascx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SearchBox.ascx.cs
@@ -98,10 +98,27 @@ namespace WebsitePanel.Portal
 
         protected void cmdSearch_Click(object sender, ImageClickEventArgs e)
         {
-            Response.Redirect(NavigatePageURL(PortalUtils.GetUserCustomersPageId(),
-                PortalUtils.USER_ID_PARAM, PanelSecurity.SelectedUserId.ToString(),
-                "FilterColumn=" + ddlFilterColumn.SelectedValue,
-                "FilterValue=" + Server.UrlEncode(FilterValue)));
+            if (tbObjectId.Text.Length > 0)
+            {
+                Response.Redirect(PortalUtils.GetUserHomePageUrl(Int32.Parse(tbObjectId.Text)));
+            }
+            else
+            {
+                String strText = tbSearchText.Text;
+                if (strText.Length > 0)
+                {
+                    Response.Redirect(NavigatePageURL(PortalUtils.GetUserCustomersPageId(),
+                        PortalUtils.USER_ID_PARAM, PanelSecurity.SelectedUserId.ToString(),
+                        "FilterColumn=" + ddlFilterColumn.SelectedValue,
+                        "FilterValue=" + Server.UrlEncode(FilterValue)));
+                }
+                else
+                {
+                    Response.Redirect(PortalUtils.NavigatePageURL(PortalUtils.GetObjectSearchPageId(),
+                        PortalUtils.USER_ID_PARAM, PanelSecurity.SelectedUserId.ToString(),
+                        "Query=" + Server.UrlEncode(tbSearch.Text),"FullType=Users"));
+                }
+            }
         }
     }
 }
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SearchBox.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SearchBox.ascx.designer.cs
index 4ecdb2e4..3d6bf095 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SearchBox.ascx.designer.cs
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/SearchBox.ascx.designer.cs
@@ -66,6 +66,24 @@ namespace WebsitePanel.Portal {
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox tbSearchText;
         
+        /// <summary>
+        /// tbObjectId control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox tbObjectId;
+        
+        /// <summary>
+        /// tbPackageId control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.TextBox tbPackageId;
+        
         /// <summary>
         /// cmdSearch control.
         /// </summary>
diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
index a79496b7..4d84cf17 100644
--- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
@@ -4890,7 +4890,6 @@
     <Content Include="ProviderControls\HyperV2012R2_Settings.ascx" />
     <Content Include="SearchObject.ascx" />
     <Content Include="ScheduleTaskControls\UserPasswordExpirationNotificationView.ascx" />
-    <Content Include="SearchObject.ascx" />
     <Content Include="SettingsUserPasswordExpirationLetter.ascx" />
     <Content Include="SettingsUserPasswordResetLetter.ascx" />
     <Content Include="VPS2012\RemoteDesktop\Connect.aspx" />

From 00c610179ac87daefefb38f5de4e432106142705 Mon Sep 17 00:00:00 2001
From: alexY <devnull@localhost>
Date: Wed, 29 Apr 2015 16:13:03 +0300
Subject: [PATCH 3/3] db script fix

---
 WebsitePanel/Database/update_db.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql
index 362d6405..611a5240 100644
--- a/WebsitePanel/Database/update_db.sql
+++ b/WebsitePanel/Database/update_db.sql
@@ -10733,7 +10733,8 @@ CREATE PROCEDURE [dbo].[GetSearchObject]
 	@StartRow int,
 	@MaximumRows int = 0,
 	@Recursive bit,
-	@ColType nvarchar(50) = ''
+	@ColType nvarchar(50) = '',
+	@FillType nvarchar(50) = ''
 )
 AS