diff --git a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java index 3c945810bf4abd3e97bf022acdece39dabb00cdd..6b0875f95cb9a16f95dc0531ce9ded02899d9938 100644 --- a/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java +++ b/src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java @@ -19,6 +19,10 @@ import de.deadlocker8.budgetmaster.services.HelpersService; import de.deadlocker8.budgetmaster.settings.SettingsService; import de.deadlocker8.budgetmaster.utils.Mappings; import de.deadlocker8.budgetmaster.utils.ResourceNotFoundException; +import de.deadlocker8.budgetmaster.utils.WebRequestUtils; +import de.deadlocker8.budgetmaster.utils.notification.Notification; +import de.deadlocker8.budgetmaster.utils.notification.NotificationType; +import de.thecodelabs.utils.util.Localization; import org.joda.time.DateTime; import org.joda.time.format.DateTimeFormat; import org.springframework.beans.factory.annotation.Autowired; @@ -27,6 +31,7 @@ import org.springframework.ui.Model; import org.springframework.util.StringUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.request.WebRequest; import javax.servlet.http.HttpServletRequest; import java.text.MessageFormat; @@ -99,9 +104,13 @@ public class TransactionController extends BaseController } @GetMapping("/{ID}/delete") - public String deleteTransaction(@PathVariable("ID") Integer ID) + public String deleteTransaction(WebRequest request, @PathVariable("ID") Integer ID) { + final Transaction transactionToDelete = transactionService.getRepository().getOne(ID); transactionService.deleteTransaction(ID); + + WebRequestUtils.putNotification(request, new Notification(Localization.getString("notification.transaction.delete.success", transactionToDelete.getName()), NotificationType.SUCCESS)); + return "redirect:/transactions"; } diff --git a/src/main/resources/languages/base_de.properties b/src/main/resources/languages/base_de.properties index 7afbe45efb44f043530f601adf250cae84031b9e..6006eed2a08c171b40fc3a9d563d374da9100fa1 100644 --- a/src/main/resources/languages/base_de.properties +++ b/src/main/resources/languages/base_de.properties @@ -105,9 +105,11 @@ notification.category.delete.not.deletable=Die Kategorie mit der ID "{0}" ist ni info.title.account.delete=Konto löschen info.text.account.delete=Möchtest du das Konto "{0}" wirklich unwiderruflich löschen?<br>Hinweis: Diesem Konto sind {1} Buchungen zugeordnet. Beim Löschen des Kontos werden diese ebenfalls gelöscht! info.button.account.delete=Konto und Buchungen löschen + info.title.transaction.delete=Buchung löschen info.text.transaction.delete=Möchtest du die Buchung "{0}" wirklich unwiderruflich löschen? info.text.transaction.repeating.delete=Möchtest du die Buchung "{0}" wirklich unwiderruflich löschen? <br>Hinweis: Es handelt sich um eine wiederholende Buchung. Beim Löschen dieser Buchung werden alle zugehörigen Wiederholungen ebenfalls gelöscht! +notification.transaction.delete.success=Die Buchung "{0}" wurde erfolgreich gelöscht. info.title.chart.delete=Diagramm löschen info.text.chart.delete=Möchtest du das Diagramm "{0}" wirklich unwiderruflich löschen? diff --git a/src/main/resources/languages/base_en.properties b/src/main/resources/languages/base_en.properties index c35d400bb5247559644e599de506ef55ecabce91..f4b555bd8539a90cca18f69128811edbfb083818 100644 --- a/src/main/resources/languages/base_en.properties +++ b/src/main/resources/languages/base_en.properties @@ -105,9 +105,11 @@ notification.category.delete.not.deletable=The category with id "{0}" is undelet info.title.account.delete=Delete Account info.text.account.delete=Do you really want to delete the account "{0}"? This can''t be undone.<br>Note: There are {1} transactions associated with this account. Deleting this account will delete all releated transactions too! info.button.account.delete=Delete Account and Transactions + info.title.transaction.delete=Delete Entry info.text.transaction.delete=Do you really want to delete the entry "{0}"? This can''t be undone. info.text.transaction.repeating.delete=Do you really want to delete the entry "{0}"? This can''t be undone.<br>Note: This transaction is a repeating transaction. Deleting this transaction will delete all related occurrences too! +notification.transaction.delete.success=Successfully deleted transaction "{0}". info.title.chart.delete=Delete Chart info.text.chart.delete=Do you really want to delete the chart "{0}"?