Merge pull request #2951 from HyphaApp/fix/file-type-validation

Add js validation for acceptable file types for all uploads

hypha/apply/funds/files.py

@@ -14,20 +14,23 @@ def generate_submission_file_path(submission_id, field_id, file_name):
 
 
 class SubmissionStreamFieldFile(StreamFieldFile):
-    def generate_filename(self):
+
+    def get_submission_id(self):
         from hypha.apply.funds.models.submissions import ApplicationRevision
         submission_id = self.instance.pk
 
         if isinstance(self.instance, ApplicationRevision):
             submission_id = self.instance.submission.pk
+        return submission_id
 
-        return generate_submission_file_path(submission_id, self.field.id, self.name)
+    def generate_filename(self):
+        return generate_submission_file_path(self.get_submission_id(), self.field.id, self.name)
 
     @property
     def url(self):
         return reverse(
             'apply:submissions:serve_private_media', kwargs={
-                'pk': self.instance.pk,
+                'pk': self.get_submission_id(),
                 'field_id': self.field.id,
                 'file_name': self.basename,
             }

hypha/apply/funds/templates/funds/applicationsubmission_form.html

@@ -44,7 +44,6 @@
 {% endblock %}
 
 {% block extra_js %}
-    <script src="{% static 'js/apply/list-input-files.js' %}"></script>
     <script src="{% static 'js/apply/tinymce-word-count.js' %}"></script>
     <script src="{% static 'js/apply/multi-input-fields.js' %}"></script>
     <script src="{% static 'js/apply/submission-form-copy.js' %}"></script>

hypha/apply/projects/templates/application_projects/invoice_form.html

@@ -30,7 +30,3 @@
     </div>
 </div>
 {% endblock %}
-
-{% block extra_js %}
-<script src="{% static 'js/apply/list-input-files.js' %}"></script>
-{% endblock %}

hypha/apply/projects/templates/application_projects/project_approval_form.html

@@ -44,7 +44,6 @@
 {% endblock %}
 
 {% block extra_js %}
-    <script src="{% static 'js/apply/list-input-files.js' %}"></script>
     <script src="{% static 'js/apply/tinymce-word-count.js' %}"></script>
     <script src="{% static 'js/apply/multi-input-fields.js' %}"></script>
     <script src="{% static 'js/apply/submission-form-copy.js' %}"></script>

hypha/apply/projects/templates/application_projects/report_form.html

@@ -73,6 +73,5 @@
 
 {% block extra_js %}
 <script src="{% static 'js/apply/jquery.fancybox.min.js' %}"></script>
-<script src="{% static 'js/apply/list-input-files.js' %}"></script>
 <script src="{% static 'js/apply/fancybox-global.js' %}"></script>
 {% endblock %}

hypha/apply/projects/templates/application_projects/vendor_form.html

@@ -36,5 +36,4 @@
 
 {% block extra_js %}
     {{ form.media.js }}
-    <script src="{% static 'js/apply/list-input-files.js' %}"></script>
 {% endblock %}

hypha/apply/projects/templates/application_projects/vendor_success.html

@@ -18,7 +18,3 @@
     <a href="{% url 'apply:projects:detail' pk=project.pk %}">{% trans "Visit Project Detail Page" %}</a>
 </div>
 {% endblock %}
-
-{% block extra_js %}
-<script src="{% static 'js/apply/list-input-files.js' %}"></script>
-{% endblock %}

hypha/static_src/src/javascript/apply/list-input-files.js

-(function ($) {
-
-    'use strict';
-
-    function listInputFiles() {
-        $('input[type=file]').change(function () {
-            // remove any existing files first
-            $(this).siblings('.form__file').remove();
-            for (let i = 0; i < $(this)[0].files.length; ++i) {
-                $(this).parents('.form__item').prepend(`
-                    <p class="form__file">${$(this)[0].files[i].name}</p>
-                `);
-            }
-        });
-    }
-
-    // Show list of selected files for upload on input[type=file]
-    listInputFiles();
-
-})(jQuery);

requirements.txt

@@ -13,7 +13,8 @@ django-basic-auth-ip-whitelist==0.3.4
 django-bleach==3.0.0
 django-countries==7.2.1
 django-extensions==3.1.5
-django-file-form==3.3.0
+# django-file-form==3.3.0
+git+https://github.com/theskumar/django-file-form.git@feature/error-message-invalid-files
 django-filter==2.4.0
 django-fsm==2.8.0
 django-heroku==0.3.1