mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-02-19 13:54:25 +01:00
Confirmation and error handling while deleting an event
This commit is contained in:
parent
bbae623cac
commit
25eb24e516
@ -5,6 +5,7 @@
|
||||
- Additional button to delete a slot, allowing to delete slots masked by others
|
||||
- Removed cross hack in full-calendar
|
||||
- Confirmation before slot delete
|
||||
- Confirmation and error handling while deleting an event
|
||||
- Fix a typo: error message while creating a machine slot
|
||||
- Fix a bug: events pagination is bogus in admin's monitoring when selecting non default filter
|
||||
- Fix a bug: social sharing failed for projects with an underscore in their name
|
||||
|
@ -132,8 +132,8 @@ Application.Controllers.controller "EventsController", ["$scope", "$state", 'Eve
|
||||
|
||||
|
||||
|
||||
Application.Controllers.controller "ShowEventController", ["$scope", "$state", "$stateParams", "Event", '$uibModal', 'Member', 'Reservation', 'Price', 'CustomAsset', 'eventPromise', 'growl', '_t', 'Wallet', 'helpers', 'priceCategoriesPromise', 'settingsPromise',
|
||||
($scope, $state, $stateParams, Event, $uibModal, Member, Reservation, Price, CustomAsset, eventPromise, growl, _t, Wallet, helpers, priceCategoriesPromise, settingsPromise) ->
|
||||
Application.Controllers.controller "ShowEventController", ["$scope", "$state", "$stateParams", "Event", '$uibModal', 'Member', 'Reservation', 'Price', 'CustomAsset', 'eventPromise', 'growl', '_t', 'Wallet', 'helpers', 'dialogs', 'priceCategoriesPromise', 'settingsPromise',
|
||||
($scope, $state, $stateParams, Event, $uibModal, Member, Reservation, Price, CustomAsset, eventPromise, growl, _t, Wallet, helpers, dialogs, priceCategoriesPromise, settingsPromise) ->
|
||||
|
||||
|
||||
|
||||
@ -183,8 +183,18 @@ Application.Controllers.controller "ShowEventController", ["$scope", "$state", "
|
||||
# @param event {$resource} angular's Event $resource
|
||||
##
|
||||
$scope.deleteEvent = (event) ->
|
||||
event.$delete ->
|
||||
$state.go('app.public.events_list')
|
||||
dialogs.confirm
|
||||
resolve:
|
||||
object: ->
|
||||
title: _t('confirmation_required')
|
||||
msg: _t('do_you_really_want_to_delete_this_event')
|
||||
, ->
|
||||
# the admin has confirmed, delete
|
||||
event.$delete ->
|
||||
$state.go('app.public.events_list')
|
||||
growl.info(_t('event_successfully_deleted'))
|
||||
, (error)->
|
||||
growl.error(_t('unable_to_delete_the_event_because_some_users_alredy_booked_it'))
|
||||
|
||||
|
||||
|
||||
|
@ -247,6 +247,10 @@ en:
|
||||
book: "Book"
|
||||
change_the_reservation: "Change the reservation"
|
||||
you_can_shift_this_reservation_on_the_following_slots: "You can shift this reservation on the following slots:"
|
||||
confirmation_required: "Confirmation required"
|
||||
do_you_really_want_to_delete_this_event: "Do you really want to delete this event?"
|
||||
event_successfully_deleted: "Event successfully deleted"
|
||||
unable_to_delete_the_event_because_some_users_alredy_booked_it: "Unable to delete this event, it may have been already reserved by some users."
|
||||
|
||||
calendar:
|
||||
# public calendar
|
||||
|
@ -249,6 +249,10 @@ fr:
|
||||
book: "Réserver"
|
||||
change_the_reservation: "Modifier la réservation"
|
||||
you_can_shift_this_reservation_on_the_following_slots: "Vous pouvez déplacer cette réservation sur les créneaux suivants :"
|
||||
confirmation_required: "Confirmation requise"
|
||||
do_you_really_want_to_delete_this_event: "Voulez-vous vraiment supprimer cet évènement ?"
|
||||
event_successfully_deleted: "L'évènement a bien été supprimé."
|
||||
unable_to_delete_the_event_because_some_users_alredy_booked_it: "Impossible de supprimer l'évènement, il est peut-être déjà réservé par certains utilisateurs."
|
||||
|
||||
calendar:
|
||||
# calendrier publique
|
||||
|
@ -247,6 +247,10 @@ pt:
|
||||
book: "Reservar"
|
||||
change_the_reservation: "Alterar reserva"
|
||||
you_can_shift_this_reservation_on_the_following_slots: "Você pode alterar essa reserva nos campos a seguir:"
|
||||
confirmation_required: "Confirmação obrigatória"
|
||||
do_you_really_want_to_delete_this_event: "Vocêrealmente deseja remover este evento?"
|
||||
event_successfully_deleted: "Evento excluído com sucesso"
|
||||
unable_to_delete_the_event_because_some_users_alredy_booked_it: "Não foi possível excluir este evento, já pode ter sido reservado por alguns usuários."
|
||||
|
||||
calendar:
|
||||
# public calendar
|
||||
|
Loading…
x
Reference in New Issue
Block a user