From 23cce8216d7d58128afeff4607d08fef44f73ab8 Mon Sep 17 00:00:00 2001 From: alexY Date: Wed, 29 Apr 2015 13:29:08 +0300 Subject: [PATCH] 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 obj = new Dictionary(); 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 obj = new Dictionary(); 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 @@