Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

B2017-222: Don’t create enhanced links for paste replaced steps

Browse Source
This commit is contained in:
Kathy Ruffing
2017-09-26 14:33:42 +00:00
parent fbedffd01d
commit 54f1be3ba1
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
PROMS/Volian.Controls.Library/RTBItem.cs
View File

@@ -241,7 +241,12 @@ namespace Volian.Controls.Library
get { return _EnhAddFromItemInfo; }
set { _EnhAddFromItemInfo = value; }
}
private ItemInfo _EnhCopiedItemInfo = null;
private bool _DoingPasteReplace = false;
public bool DoingPasteReplace
{
get { return _DoingPasteReplace; }
set { _DoingPasteReplace = value; }
}
#endregion
#region Constructors
public RTBItem(ItemInfo itemInfo, StepPanel myStepPanel, EditItem myParentEditItem, ChildRelation myChildRelation, bool expand)
@@ -825,8 +830,13 @@ namespace Volian.Controls.Library
ItemInfo.EAddpingPart addpart = ItemInfo.EAddpingPart.After;
if (EnhAddType == EnhancedAddTypes.Before) addpart = ItemInfo.EAddpingPart.Before;
else if (EnhAddType == EnhancedAddTypes.Child) addpart = ItemInfo.EAddpingPart.Child;
ItemInfo newEnh = MyItemInfo.DoAddEnhancedSteps(ed.Type, ed.ItemID, addpart);
if (newEnh != null) AddEnhancedItemToDisplayTabItem(newEnh);
// B2017-222: if replacing, don't do the enhanced links. The past replace button isn't active for enhanced,
// however, paste replace was accessed when creating a new HLS/Caution/Note and then replacing into it.
if (MyItemInfo.MyContent.Text != "" && !DoingPasteReplace)
{
ItemInfo newEnh = MyItemInfo.DoAddEnhancedSteps(ed.Type, ed.ItemID, addpart);
if (newEnh != null) AddEnhancedItemToDisplayTabItem(newEnh);
}
}
EnhAddType = EnhancedAddTypes.No;
}