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

Merge

Browse source
This commit is contained in:
alexY2004 2015-05-20 18:37:14 +03:00
commit 5fc61f26c5
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
WebsitePanel/Sources/WebsitePanel.WebPortal/App_GlobalResources/WebsitePanel_SharedResources.ascx.resx
View file

@ -5292,6 +5292,9 @@
<data name="UserItemType.ExchangeAccount" xml:space="preserve">
<value>Exchange Account</value>
</data>
<data name="UserItemType.ExchangeAccountMailbox" xml:space="preserve">
<value>Exchange Mailbox</value>
</data>
<data name="UserItemType.Users" xml:space="preserve">
<value>Account Home</value>
</data>

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

@ -118,7 +118,6 @@ namespace WebsitePanel.WebPortal
String.Format("%{0}%", filterValue), 0, 0, "", iNumResults, columnType, fullType);
DataTable dt = dsObjectItems.Tables[2];
List<Dictionary<string, string>> dataList = new List<Dictionary<string, string>>();
int currUser = 0;
for (int i = 0; i < dt.Rows.Count; ++i)
{
DataRow row = dt.Rows[i];
@ -131,10 +130,7 @@ namespace WebsitePanel.WebPortal
obj["FullType"] = type;
obj["FullTypeLocalized"] = GetTypeDisplayName(type);
obj["AccountID"] = row["AccountID"].ToString();
if (String.Equals(type, "Users"))
dataList.Insert(currUser++, obj);
else
dataList.Add(obj);
dataList.Add(obj);
}
var jsonSerialiser = new JavaScriptSerializer();

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/GlobalSearch.ascx
View file

@ -50,6 +50,10 @@
$ImgBtn.attr('disabled', 'disabled');
}
});
if (document.referrer.search("pid=Login") > 0) {
$("#<%= tbSearch.ClientID %>").focus();
}
});//]]>
</script>