diff --git a/TGS.ControlPanel/TestMergeManager.cs b/TGS.ControlPanel/TestMergeManager.cs index 6df18e1793..b463c444dc 100644 --- a/TGS.ControlPanel/TestMergeManager.cs +++ b/TGS.ControlPanel/TestMergeManager.cs @@ -130,7 +130,7 @@ namespace TGS.ControlPanel var pr = await client.PullRequest.Get(repoOwner, repoName, I.Number); var outdated = pr.Head.Sha != I.Sha; var mergedOrOutdated = pr.Merged || outdated; - InsertItem(String.Format("#{0} - {1}{3}{2}", I.Number, I.Title, mergedOrOutdated ? I.Sha : String.Empty, pr.Merged ? " - MERGED ON REMOTE: " : (outdated ? " - OUTDATED: " : String.Empty)), true, mergedOrOutdated ? CheckState.Indeterminate : CheckState.Checked); + InsertPullRequest(await client.Issue.Get(repoOwner, repoName, I.Number), true, mergedOrOutdated ? CheckState.Indeterminate : CheckState.Checked, String.Format("{1}{0}", mergedOrOutdated ? String.Format(" - {0}", I.Sha) : String.Empty, pr.Merged ? " - MERGED ON REMOTE: " : (outdated ? " - OUTDATED: " : String.Empty))); } } finally @@ -157,17 +157,12 @@ namespace TGS.ControlPanel /// The to format, must contain a /// If this or is mpt , will be inserted at the top of as opposed to the bottom /// The of the item - void InsertPullRequest(Issue issue, bool prioritize, CheckState checkState) + /// An optional to append to the entry before it's inserted + void InsertPullRequest(Issue issue, bool prioritize, CheckState checkState, string append = null) { - bool needsTesting = false; - foreach (var J in issue.Labels) - if (J.Name.ToLower().Contains("test")) - { - needsTesting = true; - prioritize = true; - break; - } - var itemString = String.Format("#{0} - {1}", issue.Number, issue.Title, needsTesting ? " - TESTING REQUESTED" : ""); + bool needsTesting = issue.Labels.Any(x => x.Name.ToLower().Contains("test")); + prioritize |= needsTesting; + var itemString = String.Format("#{0} - {1}{2}{3}", issue.Number, issue.Title, needsTesting ? " - TESTING REQUESTED" : String.Empty, append ?? String.Empty); InsertItem(itemString, prioritize, checkState); }