From b32088ee6bd4bb1993b8c4ab0a73ff29b58afa24 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Fri, 20 Oct 2017 13:38:52 +0100
Subject: [PATCH] Only add token member if they're not also a collaborator

---
 .../ide/review-panel/controllers/ReviewPanelController.coffee  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
index dd80809dca..69a3735cd2 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -83,7 +83,8 @@ define [
 			if $scope.project?.tokenMembers?
 				for member in tokenMembers
 					if member.privileges == "readAndWrite"
-						$scope.reviewPanel.formattedProjectTokenMembers[member._id] = formatUser(member)
+						if !_.find($scope.reviewPanel.formattedProjectMembers, (m) -> m.id == member._id)
+							$scope.reviewPanel.formattedProjectTokenMembers[member._id] = formatUser(member)
 
 		$scope.commentState =
 			adding: false