From dff68b187bc9b9352b82ef75491a6a9a08509fa7 Mon Sep 17 00:00:00 2001 From: apache Date: Fri, 24 Feb 2017 20:51:42 +0300 Subject: [PATCH] docs: 1) dont mask exceptions in views 2) fixed add by invoice mixin --- project/docs/views/__init__.py | 16 +++------------- project/docs/views/mixins.py | 2 +- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/project/docs/views/__init__.py b/project/docs/views/__init__.py index 9498efa..440117f 100644 --- a/project/docs/views/__init__.py +++ b/project/docs/views/__init__.py @@ -12,23 +12,13 @@ from .platejka import PlatejkaViews from .nakladn import NakladnViews from .faktura import FakturaViews from .ajax import get_pair, get_invoices, get_tbl_items, get_client_by_invoice, toggle_doc_status -#from .sfv import SfvViews - - -DEBUG = getattr(settings, 'DEBUG', False) @login_required # важно!!! def getview(request, *args, **kwargs): - try: - views = kwargs['klass'](request) # класс с вьюхами - handler = getattr(views, kwargs['oper']) # конкретная вьюха - return handler(request, *args, **kwargs) # передать управление во вьюху и вернуть ее результат - except (KeyError, AttributeError): - if DEBUG: - raise - else: - raise Http404 + views = kwargs['klass'](request) # класс с вьюхами + handler = getattr(views, kwargs['oper']) # конкретная вьюха + return handler(request, *args, **kwargs) # передать управление во вьюху и вернуть ее результат # ----------------------------------------------------------------------------- diff --git a/project/docs/views/mixins.py b/project/docs/views/mixins.py index 5d816fc..0304256 100644 --- a/project/docs/views/mixins.py +++ b/project/docs/views/mixins.py @@ -26,8 +26,8 @@ class AddByInvoiceMethodMixin(object): kwargs['initial'].update(self.init_form()) kwargs['initial']['invoice'] = invoice + kwargs['initial_items'] = [] if invoice_items: - kwargs['initial_items'] = [] for item in invoice_items: item.id = None kwargs['initial_items'].append(