From f3e020df7ed4fabb915df42a8eb0972d91f0850f Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Tue, 9 May 2017 16:06:19 +0100 Subject: [PATCH] Add dialog to confirm bulk actions. --- .../app/views/project/editor/review-panel.pug | 29 ++++++++++++++++--- .../BulkActionsModalController.coffee | 10 +++++++ 2 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 services/web/public/coffee/ide/review-panel/controllers/BulkActionsModalController.coffee diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug index baaa583a07..47e21eb848 100644 --- a/services/web/app/views/project/editor/review-panel.pug +++ b/services/web/app/views/project/editor/review-panel.pug @@ -9,7 +9,7 @@ a.rp-bulk-actions-btn( href ng-if="reviewPanel.selectedEntryIds.length > 1" - ng-click="bulkAccept();" + ng-click="showBulkAcceptDialog();" ) i.fa.fa-check |  #{translate("accept_all")} @@ -17,7 +17,7 @@ a.rp-bulk-actions-btn( href ng-if="reviewPanel.selectedEntryIds.length > 1" - ng-click="bulkReject();" + ng-click="showBulkRejectDialog();" ) i.fa.fa-times |  #{translate("reject_all")} @@ -101,8 +101,8 @@ ) div(ng-if="entry.type === 'bulk-actions'") bulk-actions-entry( - on-bulk-accept="bulkAccept();" - on-bulk-reject="bulkReject();" + on-bulk-accept="showBulkAcceptDialog();" + on-bulk-reject="showBulkRejectDialog();" n-entries="reviewPanel.selectedEntryIds.length" ) @@ -475,3 +475,24 @@ script(type="text/ng-template", id="trackChangesUpgradeModalTemplate") ng-click="cancel()" ) span #{translate("close")} + +script(type="text/ng-template", id="bulkActionsModalTemplate") + .modal-header + button.close( + type="button" + data-dismiss="modal" + ng-click="cancel()" + ) × + h3 {{ isAccept ? '#{translate("accept_all")}' : '#{translate("reject_all")}' }} + .modal-body + p(ng-if="isAccept") #{translate("bulk_accept_confirm", { nChanges: "{{ nChanges }}"})} + p(ng-if="!isAccept") #{translate("bulk_reject_confirm", { nChanges: "{{ nChanges }}"})} + .modal-footer() + button.btn.btn-default( + ng-click="cancel()" + ) + span #{translate("cancel")} + button.btn.btn-primary( + ng-click="confirm()" + ) + span #{translate("ok")} diff --git a/services/web/public/coffee/ide/review-panel/controllers/BulkActionsModalController.coffee b/services/web/public/coffee/ide/review-panel/controllers/BulkActionsModalController.coffee new file mode 100644 index 0000000000..575fcb9716 --- /dev/null +++ b/services/web/public/coffee/ide/review-panel/controllers/BulkActionsModalController.coffee @@ -0,0 +1,10 @@ +define [ + "base" +], (App) -> + App.controller "BulkActionsModalController", ($scope, $modalInstance, isAccept, nChanges) -> + $scope.isAccept = isAccept + $scope.nChanges = nChanges + $scope.cancel = () -> + $modalInstance.dismiss() + $scope.confirm = () -> + $modalInstance.close(isAccept) \ No newline at end of file