From 235024bef405bd194c85db9223bf930b78c3a7d6 Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 3 Mar 2016 16:52:10 +0000 Subject: [PATCH] B2016-067: Copy/paste/property edit of section caused format to change B2016-064: Reviewer can no longer copy/paste steps via keyboard shortcut F5 --- PROMS/VEPROMS User Interface/frmSectionProperties.cs | 3 ++- PROMS/Volian.Controls.Library/StepRTB.cs | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/PROMS/VEPROMS User Interface/frmSectionProperties.cs b/PROMS/VEPROMS User Interface/frmSectionProperties.cs index 7b23d9da..d21c128a 100644 --- a/PROMS/VEPROMS User Interface/frmSectionProperties.cs +++ b/PROMS/VEPROMS User Interface/frmSectionProperties.cs @@ -80,7 +80,7 @@ namespace VEPROMS private void btnSectPropOK_Click(object sender, EventArgs e) { sectionConfigBindingSource.EndEdit(); - + // Save Default settings for User // // Save whether we should display the default values on this property page @@ -467,6 +467,7 @@ namespace VEPROMS // for word docs, no enhanced controls should be visible: grpLnkEnh.Visible = false; } + ppCmbxFormat.SelectedValue = _SectionConfig.FormatSelection; _Initializing = false; //_InitialIndex = ppCmbxFormat.SelectedIndex; } diff --git a/PROMS/Volian.Controls.Library/StepRTB.cs b/PROMS/Volian.Controls.Library/StepRTB.cs index 42c017ce..1565d1c2 100644 --- a/PROMS/Volian.Controls.Library/StepRTB.cs +++ b/PROMS/Volian.Controls.Library/StepRTB.cs @@ -2244,6 +2244,11 @@ namespace Volian.Controls.Library e.Handled = true; break; case Keys.F5: + if (!UserInfo.CanEdit(MyUserInfo, MyItemInfo.MyDocVersion)) + { + e.Handled = true; + break; + } if (e.Shift) { e.Handled = true;