Fixed remove entry popup.
This commit is contained in:
parent
5dd9543b38
commit
898357d160
@ -307,11 +307,23 @@ var EntryController = function($scope, $http, $rootScope, $filter) {
|
||||
});
|
||||
};
|
||||
|
||||
$scope.removeEntry = function(entry) {
|
||||
$scope.removingEntry = entry;
|
||||
$("#remove_entry").modal({
|
||||
keyboard: false,
|
||||
});
|
||||
};
|
||||
|
||||
$scope.hideRemoveEntryPopup = function() {
|
||||
$scope.removingEntry = null;
|
||||
$("#remove_entry").modal("hide");
|
||||
};
|
||||
|
||||
// Removes an entry.
|
||||
$scope.removeEntry = function(entry, modalScope) {
|
||||
$scope.confirmRemoveEntry = function() {
|
||||
// Cancel current editing.
|
||||
if (!$scope.isNew(entry)) {
|
||||
$http.delete("/api/entries/" + entry.id).success(function (result) {
|
||||
if ($scope.removingEntry) {
|
||||
$http.delete("/api/entries/" + $scope.removingEntry.id).success(function (result) {
|
||||
$.pnotify({
|
||||
type: "success",
|
||||
title: "Delete",
|
||||
@ -319,9 +331,9 @@ var EntryController = function($scope, $http, $rootScope, $filter) {
|
||||
});
|
||||
|
||||
// Send the "entry removed" event.
|
||||
$scope.$emit("entryRemovedEvent", entry);
|
||||
$scope.$emit("entryRemovedEvent", $scope.removingEntry);
|
||||
|
||||
$scope.closeModal(modalScope);
|
||||
$scope.hideRemoveEntryPopup();
|
||||
}).error(function (data) {
|
||||
$.pnotify({
|
||||
type: "error",
|
||||
@ -329,7 +341,7 @@ var EntryController = function($scope, $http, $rootScope, $filter) {
|
||||
text: data
|
||||
});
|
||||
|
||||
$scope.closeModal(modalScope);
|
||||
$scope.hideRemoveEntryPopup();
|
||||
});
|
||||
}
|
||||
};
|
||||
|
@ -114,7 +114,7 @@
|
||||
<span class="fa fa-pencil-square-o"></span>
|
||||
</button>
|
||||
|
||||
<button class="btn btn-xs btn-default" data-toggle="modal" data-target="#remove_entry" title="remove">
|
||||
<button class="btn btn-xs btn-default" ng-click="removeEntry(entry)" title="remove">
|
||||
<span class="fa fa-trash-o"></span>
|
||||
</button>
|
||||
|
||||
|
@ -19,19 +19,19 @@
|
||||
<div class="modal-content">
|
||||
<!-- Dialog header with title -->
|
||||
<div class="modal-header">
|
||||
<button class="close" ng-click="dismiss()" aria-hidden="true">×</button>
|
||||
<h4 class="modal-title" id="remove_entry_header">Supprimer l'entrée [[entry.label]]</h4>
|
||||
<button class="close" ng-click="hideRemoveEntryPopup()" aria-hidden="true">×</button>
|
||||
<h4 class="modal-title" id="remove_entry_header">Supprimer l'entrée #[[removingEntry.id]]</h4>
|
||||
</div>
|
||||
|
||||
<!-- Dialog body -->
|
||||
<div class="modal-body">
|
||||
<p>Confirmez-vous la suppression de cette entrée ?</p>
|
||||
<p>Confirmez-vous la suppression de l'entrée « [[ removingEntry.label ]] » ?</p>
|
||||
</div>
|
||||
|
||||
<!-- Dialog footer with buttons -->
|
||||
<div class="modal-footer">
|
||||
<button href="#" class="btn btn-primary" ng-click="dismiss()">Non</button>
|
||||
<button href="#" class="btn btn-default" ng-click="removeEntry(entry, this)">Oui</button>
|
||||
<button href="#" class="btn btn-primary" ng-click="hideRemoveEntryPopup()">Non</button>
|
||||
<button href="#" class="btn btn-default" ng-click="confirmRemoveEntry()">Oui</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
Loading…
Reference in New Issue
Block a user