Merge branch 'url-date-and-time-additional-info' into deploy

Author: JeffersonBledsoe

src/collective/volto/formsupport/adapters/post.py

@@ -293,7 +293,7 @@ def filter_parameters(self):
         """
         fields = [field for field in self.format_fields() if field.send_in_email]
 
-        additionalInfo = self.block['sendAdditionalInfo']
+        additionalInfo = self.block.get('sendAdditionalInfo', [])
 
         if "date" in additionalInfo:
             fields.append(construct_field({'field_id': 'date', 'label': 'Date', 'field_type': 'date', 'value': datetime.now()}))

src/collective/volto/formsupport/datamanager/catalog.py

@@ -102,7 +102,7 @@ def add(self, data):
         record.attrs["fields_labels"] = fields_labels
         record.attrs["fields_order"] = fields_order
         record.attrs["date"] = datetime.now()
-        if self.get_block()['sendAdditionalInfo']:
+        if self.get_block().get('sendAdditionalInfo'):
             record.attrs["url"] = self.context.absolute_url_path()
         record.attrs["block_id"] = self.block_id
         return self.soup.add(record)

src/collective/volto/formsupport/restapi/services/form_data/csv.py

@@ -68,7 +68,7 @@ def get_data(self):
         store = getMultiAdapter((self.context, self.request), IFormDataStore)
         sbuf = StringIO()
         fixed_columns = ["date"]
-        if "currentUrl" in self.form_block['sendAdditionalInfo']:
+        if "currentUrl" in self.form_block.get('sendAdditionalInfo', []):
             fixed_columns.append("url")
         columns = []