diff --git a/Ginger/Ginger/Run/RunSetActions/ExportResultsToALMConfigPage.xaml.cs b/Ginger/Ginger/Run/RunSetActions/ExportResultsToALMConfigPage.xaml.cs index b6205cbd9e..d2280b7d6b 100644 --- a/Ginger/Ginger/Run/RunSetActions/ExportResultsToALMConfigPage.xaml.cs +++ b/Ginger/Ginger/Run/RunSetActions/ExportResultsToALMConfigPage.xaml.cs @@ -119,6 +119,7 @@ public bool Init(ObservableList bfs, ValueExpression VE, Context C xALMTestSetLevelCbx.Init(PublishToALMConfig.eALMTestSetLevel.BusinessFlow, nameof(RunSetActionPublishToQC.ALMTestSetLevel), Enum.GetValues(typeof(eALMTestSetLevel)).Cast().ToList(), ComboBox.SelectedValueProperty); xALMTypeCbx.ComboBox.SelectedValue = AlmConfig.AlmType; xALMTestSetLevelCbx.ComboBox.SelectedValue = PublishToALMConfig.eALMTestSetLevel.BusinessFlow; + SearchALMEntityByNamePnl.Visibility = Visibility.Collapsed; xALMTestSetLevelCbx.IsEnabled = false; xALMTypeCbx.IsEnabled = false; mBfs = bfs; diff --git a/Ginger/GingerCore/ALM/RQM/RQMConnect.cs b/Ginger/GingerCore/ALM/RQM/RQMConnect.cs index f9bd738910..30c89e9aa5 100644 --- a/Ginger/GingerCore/ALM/RQM/RQMConnect.cs +++ b/Ginger/GingerCore/ALM/RQM/RQMConnect.cs @@ -216,7 +216,7 @@ private void GetRQMProjectListConfiguration() { XmlSerializer serializer = new XmlSerializer(typeof(RQMProjectListConfiguration)); - FileStream fs = new FileStream(importConfigTemplate, FileMode.Open); + FileStream fs = new FileStream(importConfigTemplate, FileMode.Open,FileAccess.Read); reader = XmlReader.Create(fs); RQMProjectListConfig = (RQMProjectListConfiguration)serializer.Deserialize(reader); fs.Close(); diff --git a/Ginger/GingerCoreNET/Run/RunSetActions/RunSetActionPublishToQCOperations.cs b/Ginger/GingerCoreNET/Run/RunSetActions/RunSetActionPublishToQCOperations.cs index 956a2e9311..707fe87325 100644 --- a/Ginger/GingerCoreNET/Run/RunSetActions/RunSetActionPublishToQCOperations.cs +++ b/Ginger/GingerCoreNET/Run/RunSetActions/RunSetActionPublishToQCOperations.cs @@ -179,6 +179,8 @@ private BusinessFlow ConvertRunSetToBF(IReportInfo reportInfo) virtualAG.Description = runSetBF.Description; virtualAG.ExternalID = !string.IsNullOrEmpty(runSetBF.ExternalID) ? runSetBF.ExternalID : string.Empty; virtualAG.ParentGuid = runSetBF.Guid;//Business flow instance Guid passing in Parent Guid to Update External Id back + virtualAG.StartTimeStamp = runSetBF.StartTimeStamp; + virtualAG.EndTimeStamp = runSetBF.EndTimeStamp; if (Enum.IsDefined(typeof(eActivitiesGroupRunStatus), runSetBF.RunStatus.ToString())) { virtualAG.RunStatus = (eActivitiesGroupRunStatus)Enum.Parse(typeof(eActivitiesGroupRunStatus), runSetBF.RunStatus.ToString()); @@ -190,7 +192,9 @@ private BusinessFlow ConvertRunSetToBF(IReportInfo reportInfo) virtualBF.AddActivitiesGroup(virtualAG); foreach (Activity runSetAct in runSetBF.Activities) { - virtualBF.AddActivity((Activity)runSetAct.CreateCopy(false), virtualAG, -1, false); + Activity activitycopy = (Activity)runSetAct.CreateCopy(false); + activitycopy.Status = runSetAct.Status; + virtualBF.AddActivity(activitycopy, virtualAG, -1, false); } } }