From 76ea497b339cbfd9fefd7a543a7df3ee077fe070 Mon Sep 17 00:00:00 2001
From: Paulo Reis <paulojreis@gmail.com>
Date: Tue, 2 May 2017 15:43:45 +0100
Subject: [PATCH] Use a single entry for bulk actions.

---
 .../app/views/project/editor/review-panel.pug    |  6 ++----
 .../controllers/ReviewPanelController.coffee     | 16 +++++-----------
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug
index 132cce7232..c87a5016af 100644
--- a/services/web/app/views/project/editor/review-panel.pug
+++ b/services/web/app/views/project/editor/review-panel.pug
@@ -82,10 +82,8 @@
 						on-submit="submitNewComment(content);"
 						on-cancel="cancelNewComment();"
 					)
-				div(ng-if="entry.type === 'bulk-accept'")
-					| Bulk accept
-				div(ng-if="entry.type === 'bulk-reject'")
-					| Bulk reject
+				div(ng-if="entry.type === 'bulk-actions'")
+					| Bulk actions.
 
 	.rp-entry-list(
 		ng-if="reviewPanel.subView === SubViews.OVERVIEW"
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 4bce7facc8..c5cef1eaba 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -159,7 +159,7 @@ define [
 			entries = $scope.reviewPanel.entries[$scope.editor.open_doc_id] or {}
 			permEntries = {}
 			for entry, entryData of entries
-				if entry not in [ "add-comment", "bulk-accept", "bulk-reject" ]
+				if entry not in [ "add-comment", "bulk-actions" ]
 					permEntries[entry] = entryData 
 			Object.keys(permEntries).length
 		), (nEntries) ->
@@ -285,8 +285,7 @@ define [
 			entries = getDocEntries(doc_id)
 
 			delete entries["add-comment"]
-			delete entries["bulk-accept"]
-			delete entries["bulk-reject"]
+			delete entries["bulk-actions"]
 
 			if selection
 				entries["add-comment"] = {
@@ -294,13 +293,8 @@ define [
 					offset: selection_offset_start
 					length: selection_offset_end - selection_offset_start
 				}
-				entries["bulk-accept"] = {
-					type: "bulk-accept"
-					offset: selection_offset_start
-					length: selection_offset_end - selection_offset_start
-				}
-				entries["bulk-reject"] = {
-					type: "bulk-reject"
+				entries["bulk-actions"] = {
+					type: "bulk-actions"
 					offset: selection_offset_start
 					length: selection_offset_end - selection_offset_start
 				}
@@ -312,7 +306,7 @@ define [
 					entry.focused = (entry.offset <= selection_offset_start <= entry.offset + entry.content.length)
 				else if entry.type == "delete"
 					entry.focused = (entry.offset == selection_offset_start)
-				else if entry.type in [ "add-comment", "bulk-accept", "bulk-reject" ] and selection
+				else if entry.type in [ "add-comment", "bulk-actions" ] and selection
 					entry.focused = true
 			
 			$scope.$broadcast "review-panel:recalculate-screen-positions"