From 0adda57f62428b4b78d9e7ced9680173cd812ba4 Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Tue, 7 Aug 2012 20:35:32 -0400 Subject: [PATCH] Commit changes to Display SQL Server name on Edit Database Screen --- .../WebsitePanel.Installer/Updater.exe | Bin 198144 -> 198144 bytes .../SqlEditDatabase.ascx.resx | 6 ++ .../WebsitePanel/SqlEditDatabase.ascx | 12 +++- .../WebsitePanel/SqlEditDatabase.ascx.cs | 19 ++++- .../SqlEditDatabase.ascx.designer.cs | 67 +++++++++++++++++- 5 files changed, 100 insertions(+), 4 deletions(-) diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe index 54d824995010dff22c48ee75ab30e64d8a8f12ff..e56d4d97a51260f313396f981925e2a2cfc80b53 100644 GIT binary patch delta 44 zcmZqZ;c4jMnb5(+pxW5g+QqoFi|J5-fTQ^iovZKX`RrU_Eb$?JXV> Database name: + + Internal DB Server: + + + External DB Server: + Users diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx index faa3bf95..d8ee347e 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx @@ -23,6 +23,16 @@ function confirmation() + + + + + + + + + +
@@ -33,7 +43,7 @@ function confirmation() - diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.cs index 4877e95a..f5ac7748 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.cs @@ -149,12 +149,29 @@ namespace WebsitePanel.Portal if (!IsPostBack) { // bind item to controls + string myintserveraddress = ""; + string myextserveraddress = ""; if (item != null) { + + string[] mysettings = ES.Services.Servers.GetServiceSettings(item.ServiceId); + foreach (string setting in mysettings) + { + string[] pair = setting.Split('='); + if(String.Equals(pair[0], "ExternalAddress", StringComparison.InvariantCultureIgnoreCase)) + myextserveraddress = pair[1]; + if (String.Equals(pair[0], "InternalAddress", StringComparison.InvariantCultureIgnoreCase)) + myintserveraddress = pair[1]; + + } + // bind item to controls usernameControl.Text = item.Name; usernameControl.EditMode = true; - + usernameControl3.Text = myextserveraddress; + usernameControl3.EditMode = true; + usernameControl2.Text = myintserveraddress; + usernameControl2.EditMode = true; foreach (string user in item.Users) { ListItem li = dlUsers.Items.FindByValue(user); diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.designer.cs b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.designer.cs index 58607255..228326b9 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.designer.cs @@ -1,10 +1,37 @@ +// Copyright (c) 2012, Outercurve Foundation. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without modification, +// are permitted provided that the following conditions are met: +// +// - Redistributions of source code must retain the above copyright notice, this +// list of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// +// - Neither the name of the Outercurve Foundation nor the names of its +// contributors may be used to endorse or promote products derived from this +// software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +// ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +// ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3074 // // Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -40,6 +67,42 @@ namespace WebsitePanel.Portal { /// protected global::WebsitePanel.Portal.UsernameControl usernameControl; + /// + /// lblDBInternalServer control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblDBInternalServer; + + /// + /// usernameControl2 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebsitePanel.Portal.UsernameControl usernameControl2; + + /// + /// lblDBExternalServer control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblDBExternalServer; + + /// + /// usernameControl3 control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::WebsitePanel.Portal.UsernameControl usernameControl3; + /// /// secUsers control. ///
+