From 141efa1b1badb9b00da0c1932a30a2c4f605206b Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Wed, 8 Aug 2012 18:44:34 -0400 Subject: [PATCH] Backed out changeset: b2f65fa37117 --- .../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, 4 insertions(+), 100 deletions(-) diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe b/WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe index a1a43b1ba0d55bb285a6265a9f543b8cf4eedfb7..54d824995010dff22c48ee75ab30e64d8a8f12ff 100644 GIT binary patch delta 44 zcmV+{0Mq|~j0}K`43LNdaO;7Jg^B^SiUPuL5Z?P+ug@eLL6`mP2jPfPRJUAl0;H72 CT@=dz delta 44 zcmV+{0Mq|~j0}K`43LNdkMV(ug^B^SiUPuL5Z#iD#35wML8GBIHG${`q_ 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 d8ee347e..faa3bf95 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx @@ -23,16 +23,6 @@ function confirmation() - - - - - - - - - -
@@ -43,7 +33,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 f5ac7748..4877e95a 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.cs @@ -149,29 +149,12 @@ 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 228326b9..58607255 100644 --- a/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.designer.cs +++ b/WebsitePanel/Sources/WebsitePanel.WebPortal/DesktopModules/WebsitePanel/SqlEditDatabase.ascx.designer.cs @@ -1,37 +1,10 @@ -// 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. // //------------------------------------------------------------------------------ @@ -67,42 +40,6 @@ 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. ///
+