From ea01a472089ea08b93efad2492ef951462bf56a3 Mon Sep 17 00:00:00 2001 From: alexY Date: Thu, 30 Apr 2015 15:53:29 +0300 Subject: [PATCH 1/2] Full type name fix --- WebsitePanel/Database/update_db.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql index f3d7e30a..d646dd41 100644 --- a/WebsitePanel/Database/update_db.sql +++ b/WebsitePanel/Database/update_db.sql @@ -10848,7 +10848,7 @@ SET @sqlSpace = ' SI.ItemID as ItemID, SI.ItemName as TextSearch, STYPE.DisplayName as ColumnType, - SI.ItemName as FullType, + STYPE.DisplayName as FullType, SI.PackageID as PackageID FROM @ItemsService AS I INNER JOIN ServiceItems AS SI ON I.ItemID = SI.ItemID From 589fcbff09f961999103aca5a9415b37f4896322 Mon Sep 17 00:00:00 2001 From: alexY Date: Thu, 30 Apr 2015 16:40:55 +0300 Subject: [PATCH 2/2] rowCount bug fix for autocomplete --- .../WebsitePanel/Code/Helpers/AjaxHandler.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 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 a42791e0..5116835c 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs @@ -61,16 +61,13 @@ namespace WebsitePanel.WebPortal for (int i = 0; i < dt.Rows.Count; ++i) { DataRow row = dt.Rows[i]; - if ((fullType == null) || (fullType.Length == 0) || (fullType == row["FullType"].ToString())) - { - 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); - } + 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); } var jsonSerialiser = new JavaScriptSerializer();