From 8aee0edfe8f0c85f994bb3306d7e2f1c5aae0a8d Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Tue, 9 May 2017 16:06:34 +0100 Subject: [PATCH] Integrate bulk actions dialog with controller actions. --- .../review-panel/ReviewPanelManager.coffee | 1 + .../controllers/ReviewPanelController.coffee | 24 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/services/web/public/coffee/ide/review-panel/ReviewPanelManager.coffee b/services/web/public/coffee/ide/review-panel/ReviewPanelManager.coffee index 289f291b1f..420c9c6139 100644 --- a/services/web/public/coffee/ide/review-panel/ReviewPanelManager.coffee +++ b/services/web/public/coffee/ide/review-panel/ReviewPanelManager.coffee @@ -1,6 +1,7 @@ define [ "ide/review-panel/controllers/ReviewPanelController" "ide/review-panel/controllers/TrackChangesUpgradeModalController" + "ide/review-panel/controllers/BulkActionsModalController" "ide/review-panel/directives/reviewPanelSorted" "ide/review-panel/directives/reviewPanelToggle" "ide/review-panel/directives/changeEntry" 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 64c75f4340..478b50bd9e 100644 --- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee +++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee @@ -335,7 +335,7 @@ 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 = () -> + bulkAccept = () -> 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} $scope.$broadcast "change:bulk-accept", entry_ids @@ -345,7 +345,7 @@ define [ nEntries: $scope.reviewPanel.selectedEntryIds.length } - $scope.bulkReject = () -> + bulkReject = () -> $scope.$broadcast "change:bulk-reject", $scope.reviewPanel.selectedEntryIds.slice() $scope.reviewPanel.selectedEntryIds = [] event_tracking.sendMB "rp-bulk-reject", { @@ -353,6 +353,26 @@ define [ 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.$broadcast "comment:start_adding" $scope.toggleReviewPanel()