diff --git a/Source/TeamMate/ViewModels/PullRequestPageViewModel.cs b/Source/TeamMate/ViewModels/PullRequestPageViewModel.cs index aab91d3..de6575d 100644 --- a/Source/TeamMate/ViewModels/PullRequestPageViewModel.cs +++ b/Source/TeamMate/ViewModels/PullRequestPageViewModel.cs @@ -63,7 +63,7 @@ private ListViewModel CreateListViewModel(ICollectionView collectionView) model.Filters.Add(new ListViewFilter("Pending", (o) => ((PullRequestRowViewModel)o).IsPending)); model.Filters.Add(new ListViewFilter("Waiting", (o) => ((PullRequestRowViewModel)o).IsWaiting)); model.Filters.Add(new ListViewFilter("Signed Off", (o) => ((PullRequestRowViewModel)o).IsSignedOff)); - model.Filters.Add(new ListViewFilter("Not Signed Off / Declined By Me", (o) => !((PullRequestRowViewModel)o).IsSignedOffOrDeclinedByMe)); + model.Filters.Add(new ListViewFilter("Needs Action", (o) => ((PullRequestRowViewModel)o).IsNeedsAction)); model.Filters.Add(new ListViewFilter("Completed", (o) => ((PullRequestRowViewModel)o).IsCompleted)); model.Fields.Add(ListFieldInfo.Create("CreatedBy", "Created By")); diff --git a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs index a33f049..20fed1d 100644 --- a/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs +++ b/Source/TeamMate/ViewModels/PullRequestPickerViewModel.cs @@ -132,7 +132,11 @@ private void Invalidate() { foreach (var project in projects) { - AddProject(project.ProjectName); + // Today we can only handle Projects within the same project collection. + if (this.SessionService.Session.ProjectContext.ProjectInfo.ProjectCollectionUri == project.ProjectCollectionUri) + { + AddProject(project.ProjectName); + } } } } diff --git a/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs b/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs index 9044528..dde607d 100644 --- a/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs +++ b/Source/TeamMate/ViewModels/PullRequestRowViewModel.cs @@ -70,7 +70,7 @@ private void Invalidate() this.IsPending = this.IsActive && !this.IsSignedOff; this.IsCompleted = (this.Reference.Status == PullRequestStatus.Completed); this.IsAssignedToMe = this.IsActive && this.Reference.Reviewers.Count(x => x.Id == this.IdentityRef) == 1; - this.IsSignedOffOrDeclinedByMe = this.Reference.Reviewers.Count(x => x.Id == this.IdentityRef && (x.Vote == 10 || x.Vote == 5 || x.HasDeclined.GetValueOrDefault(false))) != 0; + this.IsNeedsAction = !this.IsOwnedByMe && (this.Reference.Reviewers.Count(x => x.Id == this.IdentityRef && (x.Vote == 10 || x.Vote == 5 || x.HasDeclined.GetValueOrDefault(false))) == 0); this.BottomLeftText = this.CreatedBy; if (this.IterationCount > 1) @@ -87,7 +87,7 @@ private void Invalidate() public bool IsActive { get; set; } public bool IsPending { get; set; } public bool IsSignedOff { get; set; } - public bool IsSignedOffOrDeclinedByMe { get; set; } + public bool IsNeedsAction { get; set; } public bool IsCompleted { get; set; } public bool IsWaiting { get; set; } diff --git a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml index 7efd4c3..fce7678 100644 --- a/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml +++ b/Source/TeamMate/Windows/PullRequestQueryEditorDialog.xaml @@ -40,10 +40,6 @@ - @@ -83,15 +79,16 @@ ItemsSource="{Binding Project}" SelectedItem="{Binding SelectedProject}" Text="{Binding NewProject, UpdateSourceTrigger=LostFocus}" - Grid.ColumnSpan="2" IsEditable="True" Grid.Row="1" /> - + + Grid.ColumnSpan="2" fw:UI.HintText="Type an email or leave it empty not to filter..."/> + Grid.ColumnSpan="2" fw:UI.HintText="Type an email or leave it empty not to filter..."/>