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 2013-10-18 07:54:34 -04:00
commit 1e3975bb14
4 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/UserControls/OrgPolicyEditor.ascx.cs
View file

@ -146,6 +146,8 @@ namespace WebsitePanel.Portal.UserControls
additionalGroups.Add(additionalGroup);
BindAdditionalGroups(additionalGroups.ToArray());
txtAdditionalGroup.Text = string.Empty;
}
protected void btnUpdateAdditionalGroup_Click(object sender, EventArgs e)
@ -160,6 +162,8 @@ namespace WebsitePanel.Portal.UserControls
.First().GroupName = txtAdditionalGroup.Text;
BindAdditionalGroups(additionalGroups.ToArray());
txtAdditionalGroup.Text = string.Empty;
}
protected void gvAdditionalGroup_RowCommand(object sender, GridViewCommandEventArgs e)

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/WebsitePanel.Portal.Modules.csproj
View file

@ -5217,7 +5217,9 @@
<SubType>Designer</SubType>
</Content>
<Content Include="ExchangeServer\App_LocalResources\OrganizationSecurityGroupMemberOf.ascx.resx" />
<Content Include="UserControls\App_LocalResources\OrgPolicyEditor.ascx.resx" />
<Content Include="UserControls\App_LocalResources\OrgPolicyEditor.ascx.resx">
<SubType>Designer</SubType>
</Content>
<EmbeddedResource Include="UserControls\App_LocalResources\EditDomainsList.ascx.resx">
<SubType>Designer</SubType>
</EmbeddedResource>