Merge pull request #2409 from FinnStutzenstein/Issue2399

Confirm multiple deletions (fixes #2399)
This commit is contained in:
Norman Jäckel 2016-09-21 14:56:19 +02:00 committed by GitHub
commit ed7c9926b5
4 changed files with 12 additions and 9 deletions

View File

@ -186,7 +186,7 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda'])
}
};
// delete selected items only if items are customslides
$scope.delete = function () {
$scope.deleteMultiple = function () {
angular.forEach($scope.items, function (item) {
if (item.selected) {
DS.destroy(item.content_object.collection, item.content_object.id);

View File

@ -105,8 +105,9 @@
<div uib-collapse="!isDeleteMode" class="row spacer">
<div class="col-sm-12 text-left">
<!-- delete button -->
<a ng-show="isDeleteMode"
os-perms="agenda.can_manage" ng-click="delete()"
<a ng-show="isDeleteMode" os-perms="agenda.can_manage"
ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected agenda items?' | translate }}"
ng-bootbox-confirm-action="deleteMultiple()"
class="btn btn-primary">
<i class="fa fa-trash fa-lg"></i>
<translate>Delete selected items</translate>

View File

@ -61,8 +61,9 @@
<div uib-collapse="!isDeleteMode" class="row spacer">
<div class="col-sm-12 text-left">
<!-- delete button -->
<a ng-show="isDeleteMode"
os-perms="assignments.can_manage" ng-click="deleteMultiple()"
<a ng-show="isDeleteMode" os-perms="assignments.can_manage"
ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected elections?' | translate }}"
ng-bootbox-confirm-action="deleteMultiple()"
class="btn btn-primary">
<i class="fa fa-trash fa-lg"></i>
<translate>Delete selected elections</translate>

View File

@ -92,7 +92,8 @@
</select>
<!-- delete button -->
<a ng-show="selectedAction == 'delete'"
ng-click="deleteMultiple()"
ng-bootbox-confirm="{{ 'Are you sure you want to delete all selected users?' | translate }}"
ng-bootbox-confirm-action="deleteMultiple()"
class="btn btn-default">
<i class="fa fa-trash fa-lg"></i>
<translate>Delete selected participants</translate>