alberanid/eventman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixes #184: close button of quick ticket

Browse source
This commit is contained in:
Davide Alberani 2017-05-07 15:18:09 +02:00
parent 028be2669e
commit de2a852c64
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
angular_app/js/controllers.js vendored
View file

@ -595,9 +595,9 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
$state.go('event.ticket.edit', {id: $scope.event._id, ticket_id: ret_ticket._id}); $state.go('event.ticket.edit', {id: $scope.event._id, ticket_id: ret_ticket._id});
} else { } else {
$scope.query = ''; $scope.query = '';
if ($scope.$close) { if ($scope.modalInstance) {
// Close the Quick ticket modal. // Close the Quick ticket modal.
$scope.$close(); $scope.modalInstance.dismiss('no reason');
} }
var msg = $scope.buildTicketLabel(ret_ticket); var msg = $scope.buildTicketLabel(ret_ticket);
msg += ' successfully added to event ' + $scope.event.title; msg += ' successfully added to event ' + $scope.event.title;
@ -651,8 +651,8 @@ eventManControllers.controller('EventTicketsCtrl', ['$scope', '$state', 'Event',
$scope.cancelForm = function() { $scope.cancelForm = function() {
if (!$state.is('event.tickets')) { if (!$state.is('event.tickets')) {
$state.go('events'); $state.go('events');
} else if ($scope.$close) { } else if ($scope.modalInstance) {
$scope.$close(); $scope.modalInstance.dismiss('no reason');
} }
}; };