diff --git a/app/settings.py b/app/settings.py index 0e527e3..a0c5394 100644 --- a/app/settings.py +++ b/app/settings.py @@ -245,7 +245,7 @@ INSTALLED_APPS = ( 'blog', 'aldryn_bootstrap3', -'debug_toolbar', +# 'debug_toolbar', 'djangocms_forms', 'smartsnippets', ) diff --git a/djangocms_forms/cms_plugins.py b/djangocms_forms/cms_plugins.py index 247c404..32dcbad 100644 --- a/djangocms_forms/cms_plugins.py +++ b/djangocms_forms/cms_plugins.py @@ -106,6 +106,7 @@ class FormPlugin(CMSPluginBase): form_slug = "form-%d" % instance.plugin_reference.id submission_instance = instance + if request.session.get(form_slug, False): try: submission_instance = FormSubmission.objects.get(id=request.session.get(form_slug, False)) @@ -121,7 +122,7 @@ class FormPlugin(CMSPluginBase): 'form': form, 'results': submission_instance }) - + return context diff --git a/djangocms_forms/forms.py b/djangocms_forms/forms.py index 7e9c5f8..c76569c 100644 --- a/djangocms_forms/forms.py +++ b/djangocms_forms/forms.py @@ -268,7 +268,6 @@ class FormBuilder(forms.Form): # Удаляем сессию, если это последний шаг. Признак последнего шага for data in form_data: if data['name'] == 'end_session': - request.session[form_slug] = None request.session['last-completed-form-id'] = form_instance.id return except (FormSubmission.DoesNotExist): diff --git a/djangocms_forms/templates/djangocms_forms/form_template/default.html b/djangocms_forms/templates/djangocms_forms/form_template/default.html index d780025..4e3520f 100644 --- a/djangocms_forms/templates/djangocms_forms/form_template/default.html +++ b/djangocms_forms/templates/djangocms_forms/form_template/default.html @@ -1,6 +1,7 @@ {% load cms_tags djangocms_forms_tags i18n sekizai_tags staticfiles %} @@ -120,11 +131,18 @@ var form = { scope = angular.element($('.bill')).scope(); if(count == 0) { - count = 1; + if(scope.classes > 0) { + count = scope.classes; + } else { + count = 1; + } } scope.$apply(function () { scope.classes = count; + if(scope.classes > 5) { + scope.extra_classes = scope.classes - 5; + } }); }; });