Handle nulls for selected values
This commit is contained in:
parent
612b043186
commit
c09a44a14f
@ -41,7 +41,12 @@ namespace VEPROMS
|
||||
{
|
||||
_SelectedStepTabPanel = value;
|
||||
if (value == null) // DSO Tab Panel
|
||||
SelectedDVI = tc.SelectedDisplayTabItem.MyItemInfo.MyActiveParent.ActiveParent as DocVersionInfo;
|
||||
{
|
||||
if (tc.SelectedDisplayTabItem != null)
|
||||
SelectedDVI = tc.SelectedDisplayTabItem.MyItemInfo.MyActiveParent.ActiveParent as DocVersionInfo;
|
||||
else
|
||||
SelectedDVI = null;
|
||||
}
|
||||
else // Step Tab Panel
|
||||
SelectedDVI = value.MyStepPanel.MyProcedureItemInfo.MyProcedure.MyActiveParent as DocVersionInfo;
|
||||
}
|
||||
@ -918,7 +923,8 @@ namespace VEPROMS
|
||||
displayTags.MyRTB = args.MyStepItem.MyStepRTB;
|
||||
displayRO.ProgressBar = bottomProgBar;
|
||||
}
|
||||
SelectedStepTabPanel = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel;
|
||||
if(tc.SelectedDisplayTabItem != null)
|
||||
SelectedStepTabPanel = ((DisplayTabItem)tc.SelectedDisplayTabItem).MyStepTabPanel;
|
||||
}
|
||||
ctrlAnnotationDetails.UpdateAnnotationGrid(_CurrentItem);
|
||||
AnnotationPanelView();
|
||||
@ -1182,15 +1188,18 @@ namespace VEPROMS
|
||||
|
||||
private void InitiateSearch(bool searchFocus)
|
||||
{
|
||||
if (displaySearch1.Mydocversion == null)//!displaySearch1.OpenDocFromSearch)
|
||||
{
|
||||
if (SelectedDVI != null)
|
||||
{
|
||||
displaySearch1.Mydocversion = SelectedDVI;
|
||||
displaySearch1.advTreeStepTypesFillIn();
|
||||
}
|
||||
displaySearch1.advTreeProcSetsFillIn(searchFocus);
|
||||
}
|
||||
if (toolsPanel.Expanded)
|
||||
{
|
||||
if (displaySearch1.Mydocversion == null)//!displaySearch1.OpenDocFromSearch)
|
||||
{
|
||||
if (SelectedDVI != null)
|
||||
{
|
||||
displaySearch1.Mydocversion = SelectedDVI;
|
||||
displaySearch1.advTreeStepTypesFillIn();
|
||||
}
|
||||
displaySearch1.advTreeProcSetsFillIn(searchFocus);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void toolsPanel_ExpandedChanged(object sender, ExpandedChangeEventArgs e)
|
||||
|
Loading…
x
Reference in New Issue
Block a user