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

Integrate bulk actions dialog with controller actions.

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

+ 1 - 0
services/web/public/coffee/ide/review-panel/ReviewPanelManager.coffee

@@ -1,6 +1,7 @@
 define [
 define [
 	"ide/review-panel/controllers/ReviewPanelController"
 	"ide/review-panel/controllers/ReviewPanelController"
 	"ide/review-panel/controllers/TrackChangesUpgradeModalController"
 	"ide/review-panel/controllers/TrackChangesUpgradeModalController"
+	"ide/review-panel/controllers/BulkActionsModalController"
 	"ide/review-panel/directives/reviewPanelSorted"
 	"ide/review-panel/directives/reviewPanelSorted"
 	"ide/review-panel/directives/reviewPanelToggle"
 	"ide/review-panel/directives/reviewPanelToggle"
 	"ide/review-panel/directives/changeEntry"
 	"ide/review-panel/directives/changeEntry"

+ 22 - 2
services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee

@@ -335,7 +335,7 @@ define [
 			$scope.$broadcast "change:reject", entry_id
 			$scope.$broadcast "change:reject", entry_id
 			event_tracking.sendMB "rp-change-rejected", { view: if $scope.ui.reviewPanelOpen then $scope.reviewPanel.subView else 'mini' }
 			event_tracking.sendMB "rp-change-rejected", { view: if $scope.ui.reviewPanelOpen then $scope.reviewPanel.subView else 'mini' }
 		
 		
-		$scope.bulkAccept = () ->
+		bulkAccept = () ->
 			entry_ids = $scope.reviewPanel.selectedEntryIds.slice()
 			entry_ids = $scope.reviewPanel.selectedEntryIds.slice()
 			$http.post "/project/#{$scope.project_id}/doc/#{$scope.editor.open_doc_id}/changes/accept", { change_ids: entry_ids, _csrf: window.csrfToken}
 			$http.post "/project/#{$scope.project_id}/doc/#{$scope.editor.open_doc_id}/changes/accept", { change_ids: entry_ids, _csrf: window.csrfToken}
 			$scope.$broadcast "change:bulk-accept", entry_ids
 			$scope.$broadcast "change:bulk-accept", entry_ids
@@ -345,7 +345,7 @@ define [
 				nEntries: $scope.reviewPanel.selectedEntryIds.length
 				nEntries: $scope.reviewPanel.selectedEntryIds.length
 			}
 			}
 
 
-		$scope.bulkReject = () ->
+		bulkReject = () ->
 			$scope.$broadcast "change:bulk-reject", $scope.reviewPanel.selectedEntryIds.slice()
 			$scope.$broadcast "change:bulk-reject", $scope.reviewPanel.selectedEntryIds.slice()
 			$scope.reviewPanel.selectedEntryIds = []
 			$scope.reviewPanel.selectedEntryIds = []
 			event_tracking.sendMB "rp-bulk-reject", { 
 			event_tracking.sendMB "rp-bulk-reject", { 
@@ -353,6 +353,26 @@ define [
 				nEntries: $scope.reviewPanel.selectedEntryIds.length
 				nEntries: $scope.reviewPanel.selectedEntryIds.length
 			}
 			}
 
 
+		$scope.showBulkAcceptDialog = () ->
+			console.log "showBulkAcceptDialog"
+			showBulkActionsDialog true
+
+		$scope.showBulkRejectDialog = () -> showBulkActionsDialog false
+
+		showBulkActionsDialog = (isAccept) ->
+			$modal.open({
+				templateUrl: "bulkActionsModalTemplate"
+				controller: "BulkActionsModalController"
+				resolve:
+					isAccept: () -> isAccept
+					nChanges: () -> $scope.reviewPanel.selectedEntryIds.length
+				scope: $scope.$new()
+			}).result.then (isAccept) ->
+				if isAccept
+					bulkAccept()
+				else
+					bulkReject()
+
 		$scope.addNewComment = () ->
 		$scope.addNewComment = () ->
 			$scope.$broadcast "comment:start_adding"
 			$scope.$broadcast "comment:start_adding"
 			$scope.toggleReviewPanel()
 			$scope.toggleReviewPanel()