From cc108f3c855add1def44841c0cdc07e42a5b4cc9 Mon Sep 17 00:00:00 2001 From: Rich Date: Fri, 26 Feb 2016 16:10:47 +0000 Subject: [PATCH] Don't use the EditItem for paste if it's parent is not expanded. This keeps the pasted step from being pasted in the wrong place. Display the SQL Code Revision in the email that sends the Error Log --- PROMS/Volian.Controls.Library/DisplayTabControl.cs | 3 ++- PROMS/Volian.Controls.Library/frmSendErrorLog.cs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/PROMS/Volian.Controls.Library/DisplayTabControl.cs b/PROMS/Volian.Controls.Library/DisplayTabControl.cs index e69a18d1..e0276453 100644 --- a/PROMS/Volian.Controls.Library/DisplayTabControl.cs +++ b/PROMS/Volian.Controls.Library/DisplayTabControl.cs @@ -505,7 +505,8 @@ namespace Volian.Controls.Library if (_MyDisplayTabItems.ContainsKey(key)) // If procedure page open use it { DisplayTabItem pg = _MyDisplayTabItems[key]; - if (pg.MyStepTabPanel.MyStepPanel._LookupEditItems.ContainsKey(myItemInfo.ItemID)) + if (pg.MyStepTabPanel.MyStepPanel._LookupEditItems.ContainsKey(myItemInfo.ItemID) && + pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID].Expanded) { EditItem edtitm = pg.MyStepTabPanel.MyStepPanel._LookupEditItems[myItemInfo.ItemID]; switch (pasteType) diff --git a/PROMS/Volian.Controls.Library/frmSendErrorLog.cs b/PROMS/Volian.Controls.Library/frmSendErrorLog.cs index 1ab20a12..9f6b6778 100644 --- a/PROMS/Volian.Controls.Library/frmSendErrorLog.cs +++ b/PROMS/Volian.Controls.Library/frmSendErrorLog.cs @@ -119,7 +119,7 @@ namespace Volian.Controls.Library Match mServer = Regex.Match(connectionString, ".*Data Source=([^;]*).*"); string server = (mServer.Success) ? mServer.Groups[1].Value : "unknown"; if (server.StartsWith(@".\")) server = @"Local \ " + server.Substring(2); - string databaseName = Database.ActiveDatabase; + string databaseName = string.Format("{0}[SQL:{1:yyMM.ddHH}]", Database.ActiveDatabase, Database.RevDate); sb.Append(string.Format("SQL Server: {0}", server)); //if (databaseName == null) databaseName = Regex.Replace(connectionString, "^.*Initial Catalog=([^;]*);.*$", "$1", RegexOptions.IgnoreCase); sb.AppendLine(string.Format("\t\tDatabase: {0}", databaseName));