Merge pull request 'Development' (#104 ) from Development into master

Merging B2023-089 and F2023-131 from Development into Master. No testing required since formats are under development.
Merge pull request 'B2023-089: Search results – reselection of search results step that was deleted causes unexpected results when redisplayed in editor.' (#103 ) from GenWork into Development
2023-08-24 09:05:31 -04:00 · 2023-08-24 08:51:13 -04:00 · 2023-08-24 06:46:20 -04:00 · 2023-08-23 14:16:02 -04:00 · 2023-08-23 14:14:13 -04:00
4 changed files with 4 additions and 1 deletions
--- a/PROMS/Formats/fmtall/BASEall.xml
+++ b/PROMS/Formats/fmtall/BASEall.xml
--- a/PROMS/Formats/fmtall/GENall.xml
+++ b/PROMS/Formats/fmtall/GENall.xml
--- a/PROMS/Formats/genmacall/gen.svg
+++ b/PROMS/Formats/genmacall/gen.svg
--- a/PROMS/Volian.Controls.Library/DisplaySearch.cs
+++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs
@@ -1833,7 +1833,10 @@ namespace Volian.Controls.Library
 					if (_ItemInfo != null)
 					{
 						_OpenDocFromSearch = true;
-						DisplayTabItem dti = _TabControl.OpenItem(_ItemInfo); // open the corresponding procedure text
+						// B2023-089: selecting a deleted item from search results shows deleted step in the editor when the StepTabItem for 
+						//	the deleted item was displayed but is not the active StepTabItem.  Use its procedure if it was deleted
+						ItemInfo openItem = _ItemInfo.IsDeleted ? ItemInfo.Get(_ItemInfo.MyProcedure == null ? _ItemInfo.ItemID : _ItemInfo.MyProcedure.ItemID) : _ItemInfo;
+						DisplayTabItem dti = _TabControl.OpenItem(openItem); // open the corresponding procedure text
 						if (dti != null)
 						{
 							if (dti.MyDSOTabPanel != null)
Author	SHA1	Message	Date
Devin Jankowski	b954a41375	Merge pull request 'Development' (#104 ) from Development into master Merging B2023-089 and F2023-131 from Development into Master. No testing required since formats are under development.	2023-08-24 09:05:31 -04:00
John Jenko	25d500c44e	Merge pull request 'B2023-089: Search results – reselection of search results step that was deleted causes unexpected results when redisplayed in editor.' (#103 ) from GenWork into Development Looks good. The new logic will now handle if the step that is trying to be opened was deleted.	2023-08-24 08:51:13 -04:00
Kathy Ruffing	7312330448	B2023-089: Search results – reselection of search results step that was deleted causes unexpected results when redisplayed in editor.	2023-08-24 06:46:20 -04:00
John Jenko	0fa0213eac	Merge pull request 'F2023-131 change font of generic EOP format to Arial' (#102 ) from F2023-131_ERGsFont into Development Format only changes	2023-08-23 14:16:02 -04:00
John Jenko	314356de36	F2023-131 change font of generic EOP format to Arial	2023-08-23 14:14:13 -04:00