diff --git a/project/docs/views/base_views.py b/project/docs/views/base_views.py index d3854ab..873da86 100644 --- a/project/docs/views/base_views.py +++ b/project/docs/views/base_views.py @@ -322,21 +322,30 @@ class BaseViews(object): @method_decorator(csrf_protect) def delete(self, *args, **kwargs): """Удалить документ.""" - if self.request.method == 'POST' and '_cancel' in self.request.POST: - return redirect(self.REDIRECT_AFTER_DELETE) - - obj = self.get_obj(kwargs['id']) - - if self.request.method == 'POST': - obj.delete() - return redirect(self.REDIRECT_AFTER_DELETE) - - dictionary = { - 'padeji': self.PADEJI, - 'padeji_mnoj': self.PADEJI_MNOJ, - 'obj': obj, - } - return render(self.request, self.TEMPLATE_DELETE, dictionary) + success = False + message = None + if self.request.is_ajax(): + obj = self.get_obj(kwargs['id']) + del_num = obj.doc_num + del_id = obj.id + del_date = datetime.strftime(obj.doc_date, '%d.%m.%Y') + + if self.request.method == 'POST': + obj.delete() + success = True + result = {'title': u'Удаление документа', + 'msg': u'Удалён документ:
%s №%d от %s' % (self.PADEJI['imenit'], del_num, del_date), + 'success': success, + 'del_id': del_id, + } + return HttpResponse(json.dumps(result), mimetype='application/json') + + #dictionary = { + # 'padeji': self.PADEJI, + # 'padeji_mnoj': self.PADEJI_MNOJ, + # 'obj': obj, + #} + #return render(self.request, self.TEMPLATE_DELETE, dictionary) def prepare(self, obj, export_to=None): """Изменить/подмешать дополнительные поля к документу.""" diff --git a/project/static/js/commons.js b/project/static/js/commons.js index c393cd3..4781a52 100644 --- a/project/static/js/commons.js +++ b/project/static/js/commons.js @@ -14,7 +14,6 @@ function fetch_data(url, async) { 'timeout': 30000, 'success': function (data) { result = data; - //console.log('fetch_data = ', data); } }); return result; diff --git a/project/static/js/docs/list.filters.js b/project/static/js/docs/list.filters.js index 32e7d0b..3a1e0ee 100644 --- a/project/static/js/docs/list.filters.js +++ b/project/static/js/docs/list.filters.js @@ -22,7 +22,6 @@ function reload_page_on_filter_change(filter) { for (var i=0; i' + docname); + dlg_msg.dialog('open'); + //dlg_msg.dialog({title: data.message['title']}).html(data.message['msg']); }); }); diff --git a/project/templates/docs/_base/base_list.html b/project/templates/docs/_base/base_list.html index fc69b48..6a719b6 100644 --- a/project/templates/docs/_base/base_list.html +++ b/project/templates/docs/_base/base_list.html @@ -84,7 +84,7 @@ {% url 'docs_aktrabot_add_by_invoice' invoice_id=obj.pk as url_aktrabot_by_invoice %} {% url 'docs_nakladn_add_by_invoice' invoice_id=obj.pk as url_nakladn_by_invoice %} {% url 'docs_faktura_add_by_invoice' invoice_id=obj.pk as url_faktura_by_invoice %} -