Просмотр исходного кода

Prevent aggregation of changes from different users.

Paulo Reis 9 лет назад
Родитель
Сommit
26260fc11f

+ 6 - 1
services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee

@@ -247,7 +247,12 @@ define [
 				delete delete_changes[change.id]
 				delete delete_changes[change.id]
 				entries[change.id] ?= {}
 				entries[change.id] ?= {}
 				
 				
-				if potential_aggregate and change.op.d and change.op.p == prev_insertion.op.p + prev_insertion.op.i.length
+				if (
+					potential_aggregate and 
+					change.op.d and 
+					change.op.p == prev_insertion.op.p + prev_insertion.op.i.length and
+					change.metadata.user_id == prev_insertion.metadata.user_id
+				)
 					aggregate_entry = true
 					aggregate_entry = true
 
 
 				new_entry = {
 				new_entry = {