Merge
This commit is contained in:
commit
3eab75ce1f
2 changed files with 11 additions and 3 deletions
|
@ -845,7 +845,7 @@ namespace WebsitePanel.Portal
|
||||||
//TODO START
|
//TODO START
|
||||||
public static string GetObjectSearchPageId()
|
public static string GetObjectSearchPageId()
|
||||||
{
|
{
|
||||||
return PortalConfiguration.SiteSettings["SearchObjectPage"];
|
return "SearchObject";
|
||||||
}
|
}
|
||||||
//TODO END
|
//TODO END
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,14 @@ namespace WebsitePanel.WebPortal
|
||||||
String filterValue = context.Request.Params["term"];
|
String filterValue = context.Request.Params["term"];
|
||||||
String fullType = context.Request.Params["fullType"];
|
String fullType = context.Request.Params["fullType"];
|
||||||
String columnType = context.Request.Params["columnType"];
|
String columnType = context.Request.Params["columnType"];
|
||||||
|
String numResults = context.Request.Params["itemCount"];
|
||||||
|
int iNumResults = 15;
|
||||||
|
if ((numResults != null) && (numResults.Length > 0))
|
||||||
|
{
|
||||||
|
int num = Int32.Parse(numResults);
|
||||||
|
if (num > 0)
|
||||||
|
iNumResults = num;
|
||||||
|
}
|
||||||
|
|
||||||
if (fullType == "Spaces")
|
if (fullType == "Spaces")
|
||||||
{
|
{
|
||||||
|
@ -23,7 +31,7 @@ namespace WebsitePanel.WebPortal
|
||||||
int itemType = Int32.Parse(strItemType);
|
int itemType = Int32.Parse(strItemType);
|
||||||
DataSet dsObjectItems = ES.Services.Packages.SearchServiceItemsPaged(PanelSecurity.EffectiveUserId, itemType,
|
DataSet dsObjectItems = ES.Services.Packages.SearchServiceItemsPaged(PanelSecurity.EffectiveUserId, itemType,
|
||||||
String.Format("%{0}%", filterValue),
|
String.Format("%{0}%", filterValue),
|
||||||
"",0, 100);
|
"", 0, iNumResults);
|
||||||
DataTable dt = dsObjectItems.Tables[1];
|
DataTable dt = dsObjectItems.Tables[1];
|
||||||
List<Dictionary<string, string>> dataList = new List<Dictionary<string, string>>();
|
List<Dictionary<string, string>> dataList = new List<Dictionary<string, string>>();
|
||||||
for (int i = 0; i < dt.Rows.Count; ++i)
|
for (int i = 0; i < dt.Rows.Count; ++i)
|
||||||
|
@ -47,7 +55,7 @@ namespace WebsitePanel.WebPortal
|
||||||
{
|
{
|
||||||
DataSet dsObjectItems = ES.Services.Packages.GetSearchObject(PanelSecurity.EffectiveUserId, null,
|
DataSet dsObjectItems = ES.Services.Packages.GetSearchObject(PanelSecurity.EffectiveUserId, null,
|
||||||
String.Format("%{0}%", filterValue),
|
String.Format("%{0}%", filterValue),
|
||||||
0, 0, "", 0, 100, columnType,fullType);
|
0, 0, "", 0, iNumResults, columnType, fullType);
|
||||||
DataTable dt = dsObjectItems.Tables[2];
|
DataTable dt = dsObjectItems.Tables[2];
|
||||||
List<Dictionary<string, string>> dataList = new List<Dictionary<string, string>>();
|
List<Dictionary<string, string>> dataList = new List<Dictionary<string, string>>();
|
||||||
for (int i = 0; i < dt.Rows.Count; ++i)
|
for (int i = 0; i < dt.Rows.Count; ++i)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue