alahouze/accountant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed remove entry popup.

Browse Source
This commit is contained in:
Alexis Lahouze 2013-12-09 10:38:17 +01:00
parent 5dd9543b38
commit 898357d160
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
frontend/static/js/entries.js
View File

@ -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. // Removes an entry.
$scope.removeEntry = function(entry, modalScope) { $scope.confirmRemoveEntry = function() {
// Cancel current editing. // Cancel current editing.
if (!$scope.isNew(entry)) { if ($scope.removingEntry) {
$http.delete("/api/entries/" + entry.id).success(function (result) { $http.delete("/api/entries/" + $scope.removingEntry.id).success(function (result) {
$.pnotify({ $.pnotify({
type: "success", type: "success",
title: "Delete", title: "Delete",
@ -319,9 +331,9 @@ var EntryController = function($scope, $http, $rootScope, $filter) {
}); });
// Send the "entry removed" event. // Send the "entry removed" event.
$scope.$emit("entryRemovedEvent", entry); $scope.$emit("entryRemovedEvent", $scope.removingEntry);
$scope.closeModal(modalScope); $scope.hideRemoveEntryPopup();
}).error(function (data) { }).error(function (data) {
$.pnotify({ $.pnotify({
type: "error", type: "error",
@ -329,7 +341,7 @@ var EntryController = function($scope, $http, $rootScope, $filter) {
text: data text: data
}); });
$scope.closeModal(modalScope); $scope.hideRemoveEntryPopup();
}); });
} }
}; };

2
frontend/templates/index.html
View File

@ -114,7 +114,7 @@
<span class="fa fa-pencil-square-o"></span> <span class="fa fa-pencil-square-o"></span>
</button> </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> <span class="fa fa-trash-o"></span>
</button> </button>

10
frontend/templates/remove_entry.html
View File

@ -19,19 +19,19 @@
<div class="modal-content"> <div class="modal-content">
<!-- Dialog header with title --> <!-- Dialog header with title -->
<div class="modal-header"> <div class="modal-header">
<button class="close" ng-click="dismiss()" aria-hidden="true">&times;</button> <button class="close" ng-click="hideRemoveEntryPopup()" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="remove_entry_header">Supprimer l'entr&eacute;e [[entry.label]]</h4> <h4 class="modal-title" id="remove_entry_header">Supprimer l'entr&eacute;e #[[removingEntry.id]]</h4>
</div> </div>
<!-- Dialog body --> <!-- Dialog body -->
<div class="modal-body"> <div class="modal-body">
<p>Confirmez-vous la suppression de cette entr&eacute;e ?</p> <p>Confirmez-vous la suppression de l'entr&eacute;e « [[ removingEntry.label ]] » ?</p>
</div> </div>
<!-- Dialog footer with buttons --> <!-- Dialog footer with buttons -->
<div class="modal-footer"> <div class="modal-footer">
<button href="#" class="btn btn-primary" ng-click="dismiss()">Non</button> <button href="#" class="btn btn-primary" ng-click="hideRemoveEntryPopup()">Non</button>
<button href="#" class="btn btn-default" ng-click="removeEntry(entry, this)">Oui</button> <button href="#" class="btn btn-default" ng-click="confirmRemoveEntry()">Oui</button>
</div> </div>
</div> </div>
</div> </div>