django-apollo-forms 2.2.0__tar.gz → 2.2.2__tar.gz

{django-apollo-forms-2.2.0 → django_apollo_forms-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-apollo-forms
-Version: 2.2.0
+Version: 2.2.2
 Summary: Simple CMS for forms
 Home-page: https://morgan-and-morgan.github.io/apollo/
 Author: Morgan & Morgan Developers
@@ -21,6 +21,9 @@ Classifier: Programming Language :: Python :: 3.5
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Description-Content-Type: text/markdown
+Requires-Dist: djangorestframework<4,>=3.7
+Requires-Dist: django-filter<23,>=22
+Requires-Dist: django-rest-swagger<3,>=2
 
 ### What Apollo Is
 At [Morgan & Morgan](https://www.forthepeople.com/), the development team builds lots of forms. A lot. While most of the

{django-apollo-forms-2.2.0 → django_apollo_forms-2.2.2}/apollo/views.py

@@ -31,7 +31,6 @@ class DownloadFormSubmissions(TemplateView):
         form_id = request.GET.get('form_id')
 
         form = Form.objects.get(id=form_id)
-        fields = form.fields.select_related('template').all().order_by('template__name')
         submissions = form.submissions.all()
 
         # write the submissions to a CSV
@@ -40,7 +39,10 @@ class DownloadFormSubmissions(TemplateView):
         logger.debug('writing submission data to tmp file %s' % f.name)
 
         with open(f.name, 'w') as csvfile:
-            writer = csv.DictWriter(csvfile, [_.name for _ in fields])
+            # we need to create the set of all field names across all submissions to avoid situations where the form
+            # has changed which fields are included and it results in the header not including all fields sent
+            field_names = set([field for submission in submissions for field in submission.cleaned_data.keys() if submission.cleaned_data is not None])
+            writer = csv.DictWriter(csvfile, field_names)
 
             writer.writeheader()
 

{django-apollo-forms-2.2.0 → django_apollo_forms-2.2.2}/django_apollo_forms.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-apollo-forms
-Version: 2.2.0
+Version: 2.2.2
 Summary: Simple CMS for forms
 Home-page: https://morgan-and-morgan.github.io/apollo/
 Author: Morgan & Morgan Developers
@@ -21,6 +21,9 @@ Classifier: Programming Language :: Python :: 3.5
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Description-Content-Type: text/markdown
+Requires-Dist: djangorestframework<4,>=3.7
+Requires-Dist: django-filter<23,>=22
+Requires-Dist: django-rest-swagger<3,>=2
 
 ### What Apollo Is
 At [Morgan & Morgan](https://www.forthepeople.com/), the development team builds lots of forms. A lot. While most of the

{django-apollo-forms-2.2.0 → django_apollo_forms-2.2.2}/setup.py

@@ -13,7 +13,7 @@ def get_packages(package):
     return [dirpath for dirpath, dirnames, filenames in os.walk(package) if os.path.exists(os.path.join(dirpath, '__init__.py'))]
 
 
-version = '2.2.0'
+version = '2.2.2'
 
 # allow setup.py to be run from any path
 os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))