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

owa editing groups added

Browse source
This commit is contained in:
vfedosevich 2015-03-02 23:46:37 -08:00
parent 6dc1d0c259
commit 839f6cda2b
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/App_LocalResources/EnterpriseStorageFolderSettingsOwaEditing.ascx.resx
View file

@ -127,7 +127,7 @@
<value>Office Web App Editing</value> <value>Office Web App Editing</value>
</data> </data>
<data name="locOwaEditingSection.Text" xml:space="preserve"> <data name="locOwaEditingSection.Text" xml:space="preserve">
<value>Users</value> <value>Users And Groups</value>
</data> </data>
<data name="locTitle.Text" xml:space="preserve"> <data name="locTitle.Text" xml:space="preserve">
<value>Edit Folder</value> <value>Edit Folder</value>

2
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/EnterpriseStorageFolderSettingsOwaEditing.ascx
View file

@ -34,7 +34,7 @@
<tr> <tr>
<td colspan="2"> <td colspan="2">
<fieldset id="OwaUsersPanel" runat="server"> <fieldset id="OwaUsersPanel" runat="server">
<legend><asp:Localize ID="locOwaEditingSection" runat="server" meta:resourcekey="locOwaEditingSection" Text="Users"></asp:Localize></legend> <legend><asp:Localize ID="locOwaEditingSection" runat="server" meta:resourcekey="locOwaEditingSection" Text="Users And Groups"></asp:Localize></legend>
<wsp:OwaUsers id="owaUsers" runat="server" /> <wsp:OwaUsers id="owaUsers" runat="server" />
</fieldset> </fieldset>
</tr> </tr>

5
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/UserControls/EnterpriseStorageOwaUsersList.ascx.cs
View file

@ -94,7 +94,8 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
protected void BindPopupAccounts() protected void BindPopupAccounts()
{ {
OrganizationUser[] accounts = ES.Services.Organizations.GetOrganizationUsersPaged(PanelRequest.ItemID, ddlSearchColumn.SelectedValue, txtSearchValue.Text + "%", null, 0, Int32.MaxValue).PageUsers; ExchangeAccount[] accounts = ES.Services.EnterpriseStorage.SearchESAccounts(PanelRequest.ItemID,
ddlSearchColumn.SelectedValue, txtSearchValue.Text + "%", "");
accounts = accounts.Where(x => !GetUsers().Select(p => p.AccountName).Contains(x.AccountName)).ToArray(); accounts = accounts.Where(x => !GetUsers().Select(p => p.AccountName).Contains(x.AccountName)).ToArray();
@ -206,7 +207,7 @@ namespace WebsitePanel.Portal.ExchangeServer.UserControls
set { ViewState[DirectionString] = value; } set { ViewState[DirectionString] = value; }
} }
protected static int CompareAccount(OrganizationUser user1, OrganizationUser user2) protected static int CompareAccount(ExchangeAccount user1, ExchangeAccount user2)
{ {
return string.Compare(user1.DisplayName, user2.DisplayName); return string.Compare(user1.DisplayName, user2.DisplayName);
} }