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

autosearch compleate: full name fix

Browse source
This commit is contained in:
doctogonzo 2015-05-05 12:47:26 +02:00
parent 0d12cb94e8
commit 4345eb9989
3 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -5274,6 +5274,18 @@
<data name="ServiceItemType.VMInfo" xml:space="preserve"> <data name="ServiceItemType.VMInfo" xml:space="preserve">
<value>Virtual Machine (Private Cloud)</value> <value>Virtual Machine (Private Cloud)</value>
</data> </data>
<data name="UserItemType.Username" xml:space="preserve">
<value>Username</value>
</data>
<data name="UserItemType.Email" xml:space="preserve">
<value>E-mail</value>
</data>
<data name="UserItemType.CompanyName" xml:space="preserve">
<value>Company Name</value>
</data>
<data name="UserItemType.FullName" xml:space="preserve">
<value>Full Name</value>
</data>
<data name="Error.WEB_PUB_DISABLE" xml:space="preserve"> <data name="Error.WEB_PUB_DISABLE" xml:space="preserve">
<value>Could not disable access to Web Publishing feature for the account specified</value> <value>Could not disable access to Web Publishing feature for the account specified</value>
</data> </data>

10
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx
View file

@ -70,7 +70,7 @@
<a href="javascript: void(0)" onclick="CPopupDialog('mydialog',event)">Type</a> <a href="javascript: void(0)" onclick="CPopupDialog('mydialog',event)">Type</a>
</HeaderTemplate> </HeaderTemplate>
<ItemTemplate> <ItemTemplate>
<%# Eval("ColumnType") %> <%# GetTypeDisplayName((string)Eval("ColumnType")) %>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:TemplateField SortExpression="TextSearch" HeaderText="gvText" HeaderStyle-Wrap="false"> <asp:TemplateField SortExpression="TextSearch" HeaderText="gvText" HeaderStyle-Wrap="false">
@ -80,9 +80,11 @@
</asp:hyperlink> </asp:hyperlink>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:BoundField DataField="FullType" HtmlEncode="false" SortExpression="FullType" HeaderText="gvFullType"> <asp:TemplateField SortExpression="FullType" HeaderText="gvFullType" HeaderStyle-Wrap="false">
<HeaderStyle Wrap="false" /> <ItemTemplate>
</asp:BoundField> <%# GetTypeDisplayName((string)Eval("FullType")) %>
</ItemTemplate>
</asp:TemplateField>
</Columns> </Columns>
</asp:GridView> </asp:GridView>

8
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SearchObject.ascx.cs
View file

@ -6,6 +6,7 @@ using System.Web.UI;
using System.Web.UI.WebControls; using System.Web.UI.WebControls;
using System.Web.Script.Serialization; using System.Web.Script.Serialization;
using WebsitePanel.WebPortal; using WebsitePanel.WebPortal;
using System.Xml;
namespace WebsitePanel.Portal namespace WebsitePanel.Portal
{ {
@ -48,6 +49,13 @@ namespace WebsitePanel.Portal
} }
} }
protected string GetTypeDisplayName(string type)
{
return GetSharedLocalizedString("ServiceItemType." + type)
?? GetSharedLocalizedString("UserItemType." + type)
?? type;
}
public string GetItemPageUrl(string fullType, string itemType, int itemId, int spaceId, int accountId) public string GetItemPageUrl(string fullType, string itemType, int itemId, int spaceId, int accountId)
{ {
string res = ""; string res = "";