zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Virtuworks 2015-04-30 09:49:26 -04:00
commit d4cfe86e6c
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Database/update_db.sql
View file

@ -10848,7 +10848,7 @@ SET @sqlSpace = '
SI.ItemID as ItemID, SI.ItemID as ItemID,
SI.ItemName as TextSearch, SI.ItemName as TextSearch,
STYPE.DisplayName as ColumnType, STYPE.DisplayName as ColumnType,
SI.ItemName as FullType, STYPE.DisplayName as FullType,
SI.PackageID as PackageID SI.PackageID as PackageID
FROM @ItemsService AS I FROM @ItemsService AS I
INNER JOIN ServiceItems AS SI ON I.ItemID = SI.ItemID INNER JOIN ServiceItems AS SI ON I.ItemID = SI.ItemID

17
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Code/Helpers/AjaxHandler.cs
View file

@ -61,16 +61,13 @@ namespace WebsitePanel.WebPortal
for (int i = 0; i < dt.Rows.Count; ++i) for (int i = 0; i < dt.Rows.Count; ++i)
{ {
DataRow row = dt.Rows[i]; DataRow row = dt.Rows[i];
if ((fullType == null) || (fullType.Length == 0) || (fullType == row["FullType"].ToString())) Dictionary<string, string> obj = new Dictionary<string, string>();
{ obj["ColumnType"] = row["ColumnType"].ToString();
Dictionary<string, string> obj = new Dictionary<string, string>(); obj["TextSearch"] = row["TextSearch"].ToString();
obj["ColumnType"] = row["ColumnType"].ToString(); obj["ItemID"] = row["ItemID"].ToString();
obj["TextSearch"] = row["TextSearch"].ToString(); obj["PackageID"] = row["PackageID"].ToString();
obj["ItemID"] = row["ItemID"].ToString(); obj["FullType"] = row["FullType"].ToString();
obj["PackageID"] = row["PackageID"].ToString(); dataList.Add(obj);
obj["FullType"] = row["FullType"].ToString();
dataList.Add(obj);
}
} }
var jsonSerialiser = new JavaScriptSerializer(); var jsonSerialiser = new JavaScriptSerializer();