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

fixed

Browse source
This commit is contained in:
vfedosevich 2013-10-25 11:15:33 +03:00
parent cdf761d3ec
commit cb45022c59
5 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
WebsitePanel/Sources/WebsitePanel.EnterpriseServer.Code/HostedSolution/OrganizationController.cs
View file

@ -2581,8 +2581,11 @@ namespace WebsitePanel.EnterpriseServer
OrganizationSecurityGroup tmpSecurityGroup = GetSecurityGroupGeneralSettings(itemId, account.AccountId); OrganizationSecurityGroup tmpSecurityGroup = GetSecurityGroupGeneralSettings(itemId, account.AccountId);
if (tmpSecurityGroup != null) if (tmpSecurityGroup != null)
{
account.Notes = tmpSecurityGroup.Notes;
accounts.Add(account); accounts.Add(account);
} }
}
result.PageItems = accounts.ToArray(); result.PageItems = accounts.ToArray();

6
WebsitePanel/Sources/WebsitePanel.Providers.Base/HostedSolution/ExchangeAccount.cs
View file

@ -50,6 +50,7 @@ namespace WebsitePanel.Providers.HostedSolution
string mailboxPlan; string mailboxPlan;
string publicFolderPermission; string publicFolderPermission;
string userPrincipalName; string userPrincipalName;
string notes;
public int AccountId public int AccountId
{ {
@ -149,5 +150,10 @@ namespace WebsitePanel.Providers.HostedSolution
set { this.userPrincipalName = value; } set { this.userPrincipalName = value; }
} }
public string Notes
{
get { return this.notes; }
set { this.notes = value; }
}
} }
} }

3
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/OrganizationSecurityGroups.ascx.resx
View file

@ -150,4 +150,7 @@
<data name="Text.PageName" xml:space="preserve"> <data name="Text.PageName" xml:space="preserve">
<value>Groups</value> <value>Groups</value>
</data> </data>
<data name="gvGroupsNotes.Header" xml:space="preserve">
<value>Notes</value>
</data>
</root> </root>

5
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx
View file

@ -49,11 +49,11 @@
<asp:GridView ID="gvGroups" runat="server" AutoGenerateColumns="False" EnableViewState="true" <asp:GridView ID="gvGroups" runat="server" AutoGenerateColumns="False" EnableViewState="true"
Width="100%" EmptyDataText="gvGroups" CssSelectorClass="NormalGridView" Width="100%" EmptyDataText="gvGroups" CssSelectorClass="NormalGridView"
OnRowCommand="gvSecurityGroups_RowCommand" AllowPaging="True" AllowSorting="True" OnRowCommand="gvSecurityGroups_RowCommand" OnRowDataBound="gvSecurityGroups_RowDataBound" AllowPaging="True" AllowSorting="True"
DataSourceID="odsSecurityGroupsPaged" PageSize="20"> DataSourceID="odsSecurityGroupsPaged" PageSize="20">
<Columns> <Columns>
<asp:TemplateField HeaderText="gvGroupsDisplayName" SortExpression="DisplayName"> <asp:TemplateField HeaderText="gvGroupsDisplayName" SortExpression="DisplayName">
<ItemStyle Width="100%"></ItemStyle> <ItemStyle Width="35%"></ItemStyle>
<ItemTemplate> <ItemTemplate>
<asp:hyperlink id="lnk1" runat="server" <asp:hyperlink id="lnk1" runat="server"
NavigateUrl='<%# GetListEditUrl(Eval("AccountId").ToString()) %>'> NavigateUrl='<%# GetListEditUrl(Eval("AccountId").ToString()) %>'>
@ -61,6 +61,7 @@
</asp:hyperlink> </asp:hyperlink>
</ItemTemplate> </ItemTemplate>
</asp:TemplateField> </asp:TemplateField>
<asp:BoundField HeaderText="gvGroupsNotes" DataField="Notes" ItemStyle-Width="65%" />
<asp:TemplateField> <asp:TemplateField>
<ItemTemplate> <ItemTemplate>
<asp:ImageButton ID="cmdDelete" runat="server" Text="Delete" SkinID="ExchangeDelete" <asp:ImageButton ID="cmdDelete" runat="server" Text="Delete" SkinID="ExchangeDelete"

10
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/OrganizationSecurityGroups.ascx.cs
View file

@ -44,6 +44,8 @@ namespace WebsitePanel.Portal.ExchangeServer
{ {
public partial class OrganizationSecurityGroups : WebsitePanelModuleBase public partial class OrganizationSecurityGroups : WebsitePanelModuleBase
{ {
protected const int _NotesMaxLength = 100;
protected void Page_Load(object sender, EventArgs e) protected void Page_Load(object sender, EventArgs e)
{ {
@ -102,6 +104,14 @@ namespace WebsitePanel.Portal.ExchangeServer
} }
} }
protected void gvSecurityGroups_RowDataBound(object sender, GridViewRowEventArgs e)
{
if (e.Row.RowType == DataControlRowType.DataRow && e.Row.Cells[1].Text.Length > _NotesMaxLength)
{
e.Row.Cells[1].Text = e.Row.Cells[1].Text.Substring(0, _NotesMaxLength - 3) + "...";
}
}
protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
{ {
gvGroups.PageSize = Convert.ToInt16(ddlPageSize.SelectedValue); gvGroups.PageSize = Convert.ToInt16(ddlPageSize.SelectedValue);