From 05d9bf47d1e567e776a453123b15c134c51c8666 Mon Sep 17 00:00:00 2001
From: Paulo Reis <paulojreis@gmail.com>
Date: Wed, 3 May 2017 16:53:04 +0100
Subject: [PATCH] Use entry ids instead.

---
 .../web/app/views/project/editor/review-panel.pug  | 10 +++++-----
 .../controllers/ReviewPanelController.coffee       | 14 ++++++++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug
index c2617c452a..89d62c3ba3 100644
--- a/services/web/app/views/project/editor/review-panel.pug
+++ b/services/web/app/views/project/editor/review-panel.pug
@@ -8,20 +8,20 @@
 		) !{translate("track_changes_is_on")}
 		a.rp-bulk-actions-btn(
 			href
-			ng-if="reviewPanel.selectedEntries.length > 0"
+			ng-if="reviewPanel.selectedEntryIds.length > 0"
 			ng-click="bulkAccept();"
 		) 
 			i.fa.fa-check
 			| &nbsp;#{translate("accept_all")}
-			| ({{ reviewPanel.selectedEntries.length }})
+			| ({{ reviewPanel.selectedEntryIds.length }})
 		a.rp-bulk-actions-btn(
 			href
-			ng-if="reviewPanel.selectedEntries.length > 0"
+			ng-if="reviewPanel.selectedEntryIds.length > 0"
 			ng-click="bulkReject();"
 		) 
 			i.fa.fa-times
 			| &nbsp;#{translate("reject_all")}
-			| ({{ reviewPanel.selectedEntries.length }})
+			| ({{ reviewPanel.selectedEntryIds.length }})
 		a.rp-add-comment-btn(
 			href
 			ng-if="reviewPanel.entries[editor.open_doc_id]['add-comment'] != null"
@@ -103,7 +103,7 @@
 					bulk-actions-entry(
 						on-bulk-accept="bulkAccept();"
 						on-bulk-reject="bulkReject();"
-						n-entries="reviewPanel.selectedEntries.length"
+						n-entries="reviewPanel.selectedEntryIds.length"
 					)
 
 	.rp-entry-list(
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 7a86d5db43..474a680b07 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -26,7 +26,7 @@ define [
 			resolvedThreadIds: {}
 			rendererData: {}
 			loadingThreads: false
-			selectedEntries: []
+			selectedEntryIds: []
 
 		window.addEventListener "beforeunload", () ->
 			collapsedStates = {}
@@ -284,7 +284,7 @@ define [
 		$scope.$on "editor:focus:changed", (e, selection_offset_start, selection_offset_end, selection) ->
 			doc_id = $scope.editor.open_doc_id
 			entries = getDocEntries(doc_id)
-			$scope.reviewPanel.selectedEntries = []
+			$scope.reviewPanel.selectedEntryIds = []
 
 			delete entries["add-comment"]
 			delete entries["bulk-actions"]
@@ -307,11 +307,11 @@ define [
 				else if entry.type == "insert"
 					isEntryWithinSelection = entry.offset >= selection_offset_start and entry.offset + entry.content.length <= selection_offset_end
 					entry.focused = (entry.offset <= selection_offset_start <= entry.offset + entry.content.length)
-					$scope.reviewPanel.selectedEntries.push entry if isEntryWithinSelection
+					$scope.reviewPanel.selectedEntryIds.push id if isEntryWithinSelection
 				else if entry.type == "delete"
 					isEntryWithinSelection = selection_offset_start <= entry.offset <= selection_offset_end
 					entry.focused = (entry.offset == selection_offset_start)
-					$scope.reviewPanel.selectedEntries.push entry if isEntryWithinSelection
+					$scope.reviewPanel.selectedEntryIds.push id if isEntryWithinSelection
 				else if entry.type in [ "add-comment", "bulk-actions" ] and selection
 					entry.focused = true
 			
@@ -327,6 +327,12 @@ define [
 			$scope.$broadcast "change:reject", entry_id
 			event_tracking.sendMB "rp-change-rejected", { view: if $scope.ui.reviewPanelOpen then $scope.reviewPanel.subView else 'mini' }
 		
+		$scope.bulkAccept = () ->
+			console.log $scope.reviewPanel.selectedEntryIds
+
+		$scope.bulkReject = () ->
+			console.log $scope.reviewPanel.selectedEntryIds
+
 		$scope.addNewComment = () ->
 			$scope.$broadcast "comment:start_adding"
 			$scope.toggleReviewPanel()