fixes to change manager

This commit is contained in:
Rich 2012-01-23 13:56:56 +00:00
parent 21ba5556f7
commit e428553e06
2 changed files with 10 additions and 1 deletions

View File

@ -871,6 +871,11 @@ namespace Volian.Controls.Library
#endregion #endregion
#region AddRtfTextAndStyles #region AddRtfTextAndStyles
private string _LastRtf = ""; private string _LastRtf = "";
public string LastRtf
{
get { return _LastRtf; }
set { _LastRtf = value; }
}
private bool _lastReadOnly = false; private bool _lastReadOnly = false;
private void AddRtfText(string txt) private void AddRtfText(string txt)
{ {
@ -1268,6 +1273,10 @@ namespace Volian.Controls.Library
// 'dotnetbar' when text was NOT Changed. So _IsDirty was made into // 'dotnetbar' when text was NOT Changed. So _IsDirty was made into
// a property and compared original rtf versus current richtextbox's // a property and compared original rtf versus current richtextbox's
// rtf. // rtf.
// the below 2 lines were added to solve the problem with the change manager detail not showing the text of an audit when the same audit
//was selected twice
if (Text == string.Empty)
LastRtf = string.Empty;
FindAllLinks(); FindAllLinks();
} }
public void StepRTB_ContentsResized(object sender, ContentsResizedEventArgs e) public void StepRTB_ContentsResized(object sender, ContentsResizedEventArgs e)

View File

@ -515,9 +515,9 @@ namespace Volian.Controls.Library
} }
private void SetButtonAndMenuEnabling(bool docontextmenus) private void SetButtonAndMenuEnabling(bool docontextmenus)
{ {
if (_MyStepRTB == null) return;
if (_MyStepRTB.FieldToEdit != E_FieldToEdit.StepText) if (_MyStepRTB.FieldToEdit != E_FieldToEdit.StepText)
return; // No need to change menu that does not get used return; // No need to change menu that does not get used
if (_MyStepRTB == null) return;
DocVersionInfo dvi = MyEditItem.MyItemInfo.MyProcedure.ActiveParent as DocVersionInfo; DocVersionInfo dvi = MyEditItem.MyItemInfo.MyProcedure.ActiveParent as DocVersionInfo;
if (dvi == null) return; if (dvi == null) return;
if (dvi.VersionType > 127 || MyEditItem.MyStepPanel.VwMode == E_ViewMode.View) if (dvi.VersionType > 127 || MyEditItem.MyStepPanel.VwMode == E_ViewMode.View)