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 2014-09-23 08:38:12 -04:00
commit ce6ab4dbdf
14 changed files with 127 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

8
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/BlackBerry/EditBlackBerryUser.ascx
View file

@ -79,7 +79,13 @@
<asp:Button runat="server" ID="btnDeleteData" meta:resourcekey="btnDeleteData"
CssClass="Button1" onclick="btnDeleteData_Click" />
</div>
</div>
<br />
<asp:Button runat="server" ID="btnSaveExit" Text="Save Changes and Exit" CssClass="Button1"
meta:resourcekey="btnSaveExit" OnClick="btnSaveExit_Click"></asp:Button>
</div>
</div>
</div>

8
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/BlackBerry/EditBlackBerryUser.ascx.cs
View file

@ -113,5 +113,13 @@ namespace WebsitePanel.Portal.BlackBerry
messageBox.ShowWarningMessage(CANNOT_DELETE_BLACKBERRY_DATA);
}
}
protected void btnSaveExit_Click(object sender, EventArgs e)
{
Response.Redirect(PortalUtils.EditUrl("ItemID", PanelRequest.ItemID.ToString(),
"blackberry_users",
"SpaceID=" + PanelSecurity.PackageId));
}
}
}

9
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/BlackBerry/EditBlackBerryUser.ascx.designer.cs generated
View file

@ -201,5 +201,14 @@ namespace WebsitePanel.Portal.BlackBerry {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnDeleteData;
/// <summary>
/// btnSaveExit control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnSaveExit;
}
}

1
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/CRM/CRMOrganizationDetails.ascx
View file

@ -68,4 +68,5 @@
</div>
</div>
</div>
</div>
</div>

12
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/CRM/CRMStorageSettings.ascx
View file

@ -16,20 +16,18 @@
<div id="ExchangeContainer">
<div class="Module">
<div class="Header">
<wsp:Breadcrumb id="breadcrumb" runat="server" PageName="Text.PageName" />
</div>
<div class="Left">
<wsp:Menu id="menu" runat="server" SelectedItem="storage_limits" />
</div>
</div>
<div class="Content">
<div class="Center">
<div class="Title">
<asp:Image ID="Image1" SkinID="ExchangeStorageConfig48" runat="server" />
<asp:Localize ID="locTitle" runat="server" meta:resourcekey="locTitle" ></asp:Localize>
<asp:Image ID="Image2" SkinID="CRMLogo" runat="server" />
<asp:Localize ID="Localize1" runat="server" Text="CRM Organization"></asp:Localize>
</div>
<div class="FormBody">
<wsp:SimpleMessageBox id="messageBox" runat="server" />
<wsp:CollapsiblePanel id="secStorageLimits" runat="server"
TargetControlID="StorageLimits" meta:resourcekey="secStorageLimits" >

28
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/CRM/CRMStorageSettings.ascx.designer.cs generated
View file

@ -1,4 +1,4 @@
// Copyright (c) 2012, Outercurve Foundation.
// Copyright (c) 2014, Outercurve Foundation.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without modification,
@ -41,40 +41,22 @@ namespace WebsitePanel.Portal {
public partial class CRMStorageSettings {
/// <summary>
/// breadcrumb control.
/// Image2 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Breadcrumb breadcrumb;
protected global::System.Web.UI.WebControls.Image Image2;
/// <summary>
/// menu control.
/// Localize1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebsitePanel.Portal.ExchangeServer.UserControls.Menu menu;
/// <summary>
/// Image1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Image Image1;
/// <summary>
/// locTitle control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Localize locTitle;
protected global::System.Web.UI.WebControls.Localize Localize1;
/// <summary>
/// messageBox control.

5
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/CRM/CRMUserRoles.ascx
View file

@ -74,7 +74,10 @@
</asp:GridView>
</div>
<br />
<asp:Button runat="server" ID="btnUpdate" Text="Update" meta:resourcekey="btnUpdate" CssClass="Button1" onclick="btnUpdate_Click" />
<asp:Button runat="server" ID="btnUpdate" Text="Save Changes" meta:resourcekey="btnUpdate" CssClass="Button1" onclick="btnUpdate_Click" />
<asp:Button runat="server" ID="btnSaveExit" Text="Save Changes and Exit" CssClass="Button1"
meta:resourcekey="btnSaveExit" OnClick="btnSaveExit_Click"></asp:Button>
</div>
<br />
</div>

24
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/CRM/CRMUserRoles.ascx.cs
View file

@ -111,7 +111,7 @@ namespace WebsitePanel.Portal.CRM
}
}
protected void btnUpdate_Click(object sender, EventArgs e)
protected bool SaveSettings()
{
try
{
@ -143,13 +143,33 @@ namespace WebsitePanel.Portal.CRM
messageBox.ShowMessage(res, "UPDATE_CRM_USER_ROLES", "HostedCRM");
else
messageBox.ShowMessage(res, "UPDATE_CRM_USER_ROLES", "HostedCRM");
return res.IsSuccess && res2.IsSuccess;
}
catch(Exception ex)
catch (Exception ex)
{
messageBox.ShowErrorMessage("UPDATE_CRM_USER_ROLES", ex);
return false;
}
}
protected void btnUpdate_Click(object sender, EventArgs e)
{
SaveSettings();
}
protected void btnSaveExit_Click(object sender, EventArgs e)
{
if (SaveSettings())
{
Response.Redirect(PortalUtils.EditUrl("ItemID", PanelRequest.ItemID.ToString(),
"CRMUsers",
"SpaceID=" + PanelSecurity.PackageId));
}
}
private void ActivateUser()
{
ResultObject res = ES.Services.CRM.ChangeUserState(PanelRequest.ItemID, PanelRequest.AccountID, false);

9
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/CRM/CRMUserRoles.ascx.designer.cs generated
View file

@ -201,5 +201,14 @@ namespace WebsitePanel.Portal.CRM {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnUpdate;
/// <summary>
/// btnSaveExit control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnSaveExit;
}
}

12
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/ExchangeServer/ExchangeMailboxGeneralSettings.ascx.cs
View file

@ -87,8 +87,16 @@ namespace WebsitePanel.Portal.ExchangeServer
int.TryParse(mailboxPlanSelector.MailboxPlanId, out planId);
ExchangeMailboxPlan plan = ES.Services.ExchangeServer.GetExchangeMailboxPlan(PanelRequest.ItemID, planId);
secArchiving.Visible = plan.EnableArchiving;
secLitigationHoldSettings.Visible = plan.AllowLitigationHold && Utils.CheckQouta(Quotas.EXCHANGE2007_ALLOWLITIGATIONHOLD, Cntx);
if (plan != null)
{
secArchiving.Visible = plan.EnableArchiving;
secLitigationHoldSettings.Visible = plan.AllowLitigationHold && Utils.CheckQouta(Quotas.EXCHANGE2007_ALLOWLITIGATIONHOLD, Cntx);
}
else
{
secArchiving.Visible = false;
secLitigationHoldSettings.Visible = false;
}
}
private void BindSettings()

4
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncEditUser.ascx
View file

@ -76,8 +76,10 @@
</asp:Panel>
<div class="FormFooterClean">
<asp:Button runat="server" ID="btnSave" meta:resourcekey="btnSave" ValidationGroup="Validation1"
<asp:Button runat="server" ID="btnSave" Text="Save Changes" meta:resourcekey="btnSave" ValidationGroup="Validation1"
CssClass="Button1" onclick="btnSave_Click" />
<asp:Button runat="server" ID="btnSaveExit" Text="Save Changes and Exit" meta:resourcekey="btnSaveExit" ValidationGroup="Validation1"
CssClass="Button1" OnClick="btnSaveExit_Click"></asp:Button>
</div>
</div>
</div>

31
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncEditUser.ascx.cs
View file

@ -120,10 +120,10 @@ namespace WebsitePanel.Portal.Lync
Utils.SelectListItem(ddlPhoneNumber, lyncUser.LineUri);
}
protected void btnSave_Click(object sender, EventArgs e)
protected bool SaveSettings()
{
if (!Page.IsValid)
return;
return false;
try
{
PackageContext cntx = PackagesHelper.GetCachedPackageContext(PanelSecurity.PackageId);
@ -132,7 +132,7 @@ namespace WebsitePanel.Portal.Lync
string lineUri = "";
if ((enterpriseVoiceQuota) & (ddlPhoneNumber.Items.Count != 0)) lineUri = ddlPhoneNumber.SelectedItem.Text + ":" + tbPin.Text;
LyncUserResult res = ES.Services.Lync.SetUserLyncPlan(PanelRequest.ItemID, PanelRequest.AccountID, Convert.ToInt32(planSelector.planId));
LyncUserResult res = ES.Services.Lync.SetUserLyncPlan(PanelRequest.ItemID, PanelRequest.AccountID, Convert.ToInt32(planSelector.planId));
if (res.IsSuccess && res.ErrorCodes.Count == 0)
{
res = ES.Services.Lync.SetLyncUserGeneralSettings(PanelRequest.ItemID, PanelRequest.AccountID, lyncUserSettings.sipAddress, lineUri);
@ -141,15 +141,36 @@ namespace WebsitePanel.Portal.Lync
if (res.IsSuccess && res.ErrorCodes.Count == 0)
{
messageBox.ShowSuccessMessage("UPDATE_LYNC_USER");
return;
return true;
}
else
{
messageBox.ShowMessage(res, "UPDATE_LYNC_USER", "LYNC");
return false;
}
}
catch(Exception ex)
catch (Exception ex)
{
messageBox.ShowErrorMessage("UPDATE_LYNC_USER", ex);
return false;
}
}
protected void btnSave_Click(object sender, EventArgs e)
{
SaveSettings();
}
protected void btnSaveExit_Click(object sender, EventArgs e)
{
if (SaveSettings())
{
Response.Redirect(PortalUtils.EditUrl("ItemID", PanelRequest.ItemID.ToString(),
"lync_users",
"SpaceID=" + PanelSecurity.PackageId));
}
}
}
}

9
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/Lync/LyncEditUser.ascx.designer.cs generated
View file

@ -201,5 +201,14 @@ namespace WebsitePanel.Portal.Lync {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnSave;
/// <summary>
/// btnSaveExit control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnSaveExit;
}
}

15
WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SkinControls/UserSpaceBreadcrumb.ascx.cs
View file

@ -142,13 +142,16 @@ namespace WebsitePanel.Portal.SkinControls
ModuleControl control = null;
if (!String.IsNullOrEmpty(ctrlKey) && definition.Controls.ContainsKey(ctrlKey))
control = definition.Controls[ctrlKey];
if (!String.IsNullOrEmpty(control.Src))
if (control != null)
{
lnkOrgCurPage.Text = PortalUtils.GetLocalizedString(DM_FOLDER_VIRTUAL_PATH + control.Src, PAGE_NANE_KEY);
lnkOrgCurPage.NavigateUrl = PortalUtils.EditUrl(
"ItemID", PanelRequest.ItemID.ToString(), ctrlKey,
"SpaceID=" + PanelSecurity.PackageId.ToString());
if (!String.IsNullOrEmpty(control.Src))
{
lnkOrgCurPage.Text = PortalUtils.GetLocalizedString(DM_FOLDER_VIRTUAL_PATH + control.Src, PAGE_NANE_KEY);
lnkOrgCurPage.NavigateUrl = PortalUtils.EditUrl(
"ItemID", PanelRequest.ItemID.ToString(), ctrlKey,
"SpaceID=" + PanelSecurity.PackageId.ToString());
}
}
}
}