From 55669c79c20824a652c9ab870d0e563d70936ab4 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sat, 7 Sep 2019 20:22:30 +1000 Subject: [PATCH] Delete a currency from the currency settings view --- InvenTree/common/templates/common/delete_currency.html | 7 +++++++ InvenTree/common/urls.py | 2 +- InvenTree/common/views.py | 10 +++++++++- InvenTree/templates/InvenTree/settings/currency.html | 5 +++++ 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 InvenTree/common/templates/common/delete_currency.html diff --git a/InvenTree/common/templates/common/delete_currency.html b/InvenTree/common/templates/common/delete_currency.html new file mode 100644 index 0000000000..9dfa320668 --- /dev/null +++ b/InvenTree/common/templates/common/delete_currency.html @@ -0,0 +1,7 @@ +{% extends "modal_delete_form.html" %} + +{% block pre_form_content %} + +Are you sure you wish to delete this currency? + +{% endblock %} \ No newline at end of file diff --git a/InvenTree/common/urls.py b/InvenTree/common/urls.py index 6d19e32cf4..b5d6deadde 100644 --- a/InvenTree/common/urls.py +++ b/InvenTree/common/urls.py @@ -10,7 +10,7 @@ currency_urls = [ url(r'^new/', views.CurrencyCreate.as_view(), name='currency-create'), url(r'^(?P\d+)/edit/', views.CurrencyEdit.as_view(), name='currency-edit'), - #url(r'^(?P\d+)/delete/', views.CurrencyDelete.as_view(), name='currency-delete'), + url(r'^(?P\d+)/delete/', views.CurrencyDelete.as_view(), name='currency-delete'), ] common_urls = [ diff --git a/InvenTree/common/views.py b/InvenTree/common/views.py index 8962965772..9e72818a36 100644 --- a/InvenTree/common/views.py +++ b/InvenTree/common/views.py @@ -5,7 +5,7 @@ Django views for interacting with common models # -*- coding: utf-8 -*- from __future__ import unicode_literals -from InvenTree.views import AjaxCreateView, AjaxUpdateView +from InvenTree.views import AjaxCreateView, AjaxUpdateView, AjaxDeleteView from . import models from . import forms @@ -25,3 +25,11 @@ class CurrencyEdit(AjaxUpdateView): model = models.Currency form_class = forms.CurrencyEditForm ajax_form_title = 'Edit Currency' + + +class CurrencyDelete(AjaxDeleteView): + """ View for deleting an existing Currency object """ + + model = models.Currency + ajax_form_title = 'Delete Currency' + ajax_template_name = "common/delete_currency.html" diff --git a/InvenTree/templates/InvenTree/settings/currency.html b/InvenTree/templates/InvenTree/settings/currency.html index 41c4ab9290..460c303d34 100644 --- a/InvenTree/templates/InvenTree/settings/currency.html +++ b/InvenTree/templates/InvenTree/settings/currency.html @@ -88,6 +88,11 @@ var button = $(this); var url = "/common/currency/" + button.attr('pk') + "/delete/"; + launchModalForm(url, { + success: function() { + $("#currency-table").bootstrapTable('refresh'); + }, + }); }); $("#new-currency").click(function() {