worldwide trademarks

djangocms_forms/forms.py

@@ -264,15 +264,24 @@ class FormBuilder(forms.Form):
         if request.session.get(form_slug, False):
             try:
                 form_instance = FormSubmission.objects.get(id=request.session.get(form_slug, False))
-                form_instance.form_data += form_data
-                form_instance.save()
+
                 # Удаляем сессию, если это последний шаг. Признак последнего шага
                 for data in form_data:
+                    if data['name'] == 'clear_session':
+                        request.session[form_slug] = None
+                        form_instance = None
+
                     if data['name'] == 'end_session':
                         request.session['last-completed-form-id'] = form_instance.id
-                return
+
+                if form_instance:
+                    form_instance.form_data += form_data
+                    form_instance.save()
+                    return
+
             except (FormSubmission.DoesNotExist):
                 pass
+
         form_instance = FormSubmission.objects.create(
             plugin=self.form_definition.plugin_reference,
             ip=get_ip(request),

djangocms_forms/templates/djangocms_forms/form_template/default.html

@@ -1,7 +1,8 @@
 {% load cms_tags  djangocms_forms_tags i18n sekizai_tags staticfiles %}
+
+
 <script type="application/javascript">
 var form = {
-	'id': {{ results.id }},
 {% for item in results.form_data %}
         {% if item.label %}
         '{{ item.label }}'
@@ -9,21 +10,33 @@ var form = {
         '{{ item.name }}'
         {% endif %}
         : { 
-        	'size': 
-        	{% if item.value == True %}
-        	1
-        	{% elif item.value == False or item.value == None %}
-        	0
-        	{% else %}
-        	{{ item.value|length }}
-        	{% endif %}
-        	,
-        	'values': '{{ item.value }}',
-        	'name': '{{ item.name }}'
+            'size': 
+            {% if item.value == True %}
+            1
+            {% elif item.value == False or item.value == None %}
+            0
+            {% else %}
+            {{ item.value|length }}
+            {% endif %}
+            ,
+            {% if item.type != 'checkbox_multiple' %}
+                'values': '{{ item.value }}',
+            {% else %}
+                'values': [
+                {% if item.value|length > 0 %}
+                    {% for val in item.value %}
+                    '{{ val }}',
+                    {% endfor %}
+
+                {% endif %}
+                ],
+            {% endif %}
+            'name': '{{ item.name }}'
         },
 {% endfor %}
 };
 </script>
+
 <div class="forms" id="{{ instance.form_id }}">
 	{% if instance.title %}
 		<h3 class="title">{{ instance.title }}</h3>

zsite/static/less/service.less

@@ -119,8 +119,11 @@
 
     margin-bottom: 5px;
 
-    h5 {
+    h5, p {
         margin-left: 10px;
+    }
+
+    h5 {
         font-weight: 700;
     }
 
@@ -293,7 +296,7 @@
     .make-row();
 
     .headers {
-      .make-xs-column(5);
+      .make-xs-column(6);
       ul {
         li {
             margin-bottom: 5px;
@@ -308,7 +311,7 @@
 
     .variants {
         border-left: 2px solid #ccc;
-        .make-xs-column(7);
+        .make-xs-column(6);
     }
 
 
@@ -401,6 +404,11 @@
 
 }
 
+.trademarks-world-certs {
+    .result-paper {
+        width: 150px;
+    }
+}
 
 
 .patents-portfolio {