From de264d6311ddea6856f15e106fa2601192a41cb1 Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Wed, 18 Nov 2015 12:14:07 +0300 Subject: [PATCH] vcs: Fixed change lists grouping in "Repository" tab for custom change list columns - use real change list column value for grouping instead of just "CommittedChangeList.getBranch()" value (that was used by mistake) --- .../openapi/vcs/changes/committed/SelectGroupingAction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/SelectGroupingAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/SelectGroupingAction.java index a81e7980ce9a..61056480dbd4 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/SelectGroupingAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/SelectGroupingAction.java @@ -135,7 +135,9 @@ public class SelectGroupingAction extends LabeledComboBoxAction { @Override public String getGroupName(@NotNull CommittedChangeList changeList) { - return changeList.getBranch(); + Object value = myColumn.getValue(changeList); + + return value != null ? value.toString() : null; } @Override