Merge pull request #2474 from HyphaApp/enhancement/always-show-submission-filters

Always show submission filters. Remove the Filter button in these cases.

hypha/apply/dashboard/static/js/django_select2-checkboxes.js

@@ -20,7 +20,7 @@
                 } else if (data.selected.length == data.all.length) {
                   return 'All ' + filterType + ' selected';
                 }
-                return data.selected.length + ' of ' + data.all.length + ' ' + filterType + ' selected';
+                return data.selected.length + ' of ' + data.all.length + ' ' + filterType;
               },
               selectionAdapter: SelectionAdapter,
               returnesultsAdapter: ResultsAdapter
@@ -28,4 +28,4 @@
         });
       });
     });
-}(this.jQuery));
+}(this.jQuery));
\ No newline at end of file

hypha/apply/funds/templates/funds/base_submissions_table.html

@@ -9,7 +9,7 @@
 
 {% block content %}
     {% block table %}
-        {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=True %}
+        {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=True filter_classes="filters-open" %}
 
         {% render_table table %}
     {% endblock %}

hypha/apply/funds/templates/funds/includes/table_filter_and_search.html

@@ -47,7 +47,9 @@
 
         {# Right #}
         <div class="actions-bar__inner actions-bar__inner--right">
-            <button class="button button--filters js-toggle-filters">Filters</button>
+            {% if filter_classes != 'filters-open' %}
+                <button class="button button--filters js-toggle-filters">Filters</button>
+            {% endif %}
 
             {% if use_search|default:False %}
             <form action="{{ search_action }}" method="get" role="search" class="form form--search-desktop">

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

@@ -18,7 +18,7 @@
 
 <div class="wrapper wrapper--large wrapper--inner-space-medium">
     {% if table %}
-    {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term search_placeholder="projects" use_search=True filter_action=filter_action use_batch_actions=True %}
+    {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term search_placeholder="projects" use_search=True filter_action=filter_action use_batch_actions=True filter_classes="filters-open" %}
     {% render_table table %}
     {% else %}
     <p>No Projects Available</p>