Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

D35205_PreVersionfolder fix and Re Run Failed Icon related function A… #3301

Merged
merged 2 commits into from
Oct 16, 2023
Merged

D35205_PreVersionfolder fix and Re Run Failed Icon related function A… #3301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77ce64b
D35205_PreVersionfolder fix and Re Run Failed Icon related function A…
prashelke Oct 16, 2023
9e79b3b
Merge branch 'Releases/Official-Release' into BugFix/preVersionFolderFix
Maheshkale447 Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Ginger/Ginger/RunSetPageLib/NewRunSetPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ private void Runner_PropertyChanged(object sender, System.ComponentModel.Propert
}

UpdateRunButtonIcon();
UpdateReRunFailedButtonIcon();
}
});
}
Expand Down Expand Up @@ -939,6 +940,7 @@ private void RunSetConfig_PropertyChanged(object sender, System.ComponentModel.P
else if (e.PropertyName == nameof(RunSetConfig.IsRunning))
{
UpdateRunButtonIcon();
UpdateReRunFailedButtonIcon();
}
}

Expand Down Expand Up @@ -1947,7 +1949,7 @@ private async void xReRunFailedRunsetBtn_Click(object sender, RoutedEventArgs e)
Reporter.ToUser(eUserMsgKey.StaticInfoMessage, $"{string.Join(", ", runnerNames)} is empty, please add {GingerDicser.GetTermResValue(eTermResKey.BusinessFlows)} to run.");
return;
}
UpdateReRunFailedButtonIcon();
UpdateReRunFailedButtonIcon(true);
ResetALMDefectsSuggestions();


Expand Down
2 changes: 1 addition & 1 deletion Ginger/GingerCoreCommon/Repository/SolutionRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ public bool IsSolutionPathToAvoid(string pathToCheck)
}
}

return mCalculatedSolutionPathsToAvoid.Any(Path.GetFullPath(pathToCheck).Contains);
return mCalculatedSolutionPathsToAvoid.Any(Path.GetFullPath(pathToCheck).Contains) || mCalculatedSolutionPathsToAvoid.Any(Path.GetFullPath($"{pathToCheck}{Path.DirectorySeparatorChar}").Contains);
}

#endregion Public Functions
Expand Down
Loading