From b3270a46cf520ddd51ca9da5e919358589259981 Mon Sep 17 00:00:00 2001
From: Patrick Smith <patrick+dds@promptworks.com>
Date: Wed, 23 Jan 2019 10:31:35 -0500
Subject: [PATCH] Remove custom JSON filter

---
 atst/filters.py                                | 14 --------------
 templates/requests/financial_verification.html |  2 +-
 templates/task_orders/new/funding.html         |  2 +-
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/atst/filters.py b/atst/filters.py
index da7047b3..6eeb4229 100644
--- a/atst/filters.py
+++ b/atst/filters.py
@@ -49,19 +49,6 @@ def getOptionLabel(value, options):
         return
 
 
-def mixedContentToJson(value):
-    """
-    This coerces the file upload in form data to its filename
-    so that the data can be JSON serialized.
-    """
-    if isinstance(value, dict):
-        for k, v in value.items():
-            if hasattr(v, "filename"):
-                value[k] = v.filename
-
-    return app.jinja_env.filters["tojson"](value)
-
-
 def findFilter(value, filter_name, filter_args=[]):
     if not filter_name:
         return value
@@ -124,7 +111,6 @@ def register_filters(app):
     app.jinja_env.filters["usPhone"] = usPhone
     app.jinja_env.filters["readableInteger"] = readableInteger
     app.jinja_env.filters["getOptionLabel"] = getOptionLabel
-    app.jinja_env.filters["mixedContentToJson"] = mixedContentToJson
     app.jinja_env.filters["findFilter"] = findFilter
     app.jinja_env.filters["renderList"] = renderList
     app.jinja_env.filters["formattedDate"] = formattedDate
diff --git a/templates/requests/financial_verification.html b/templates/requests/financial_verification.html
index a9d3ea83..b66ab719 100644
--- a/templates/requests/financial_verification.html
+++ b/templates/requests/financial_verification.html
@@ -21,7 +21,7 @@
   {{ Alert(("requests.financial_verification.pending_financial_verification" | translate), fragment="fragments/pending_financial_verification.html") }}
 {% endif %}
 
-<financial inline-template v-bind:initial-data='{{ f.data|mixedContentToJson }}'>
+<financial inline-template v-bind:initial-data='{{ f.data|tojson }}'>
 <div class="col">
   {% if extended %}
     {{ Alert(("requests.financial_verification.manually_enter_task_information_label" | translate),
diff --git a/templates/task_orders/new/funding.html b/templates/task_orders/new/funding.html
index 3f026272..79efa6d6 100644
--- a/templates/task_orders/new/funding.html
+++ b/templates/task_orders/new/funding.html
@@ -14,7 +14,7 @@
 
 <funding
   inline-template
-  v-bind:initial-data='{{ form.data|mixedContentToJson }}'
+  v-bind:initial-data='{{ form.data|tojson }}'
   v-bind:upload-errors='{{ form.csp_estimate.errors | list }}'
   >
   <div>