Merge pull request #5211 from dimagi/revert-5182-hide-media-download

Revert "Only show the multimedia column if ther is media"
dimagi · Jan 6, 2015 · 2211a34 · 2211a34
2 parents e653fb6 + d561186
commit 2211a34
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/corehq/apps/reports/standard/export.py b/corehq/apps/reports/standard/export.py
@@ -280,7 +280,6 @@ def _sortkey(form):
                 if group.form_exports],
             report_slug=self.slug,
             property_hash=self.properties(size_hash),
-            has_media=self.request.project.has_media(),
         )
         return context
 

diff --git a/corehq/apps/reports/templates/reports/partials/saved_custom_exports.html b/corehq/apps/reports/templates/reports/partials/saved_custom_exports.html
@@ -9,7 +9,7 @@
             <th>{% trans "Edit" %}</th>
         {% endif %}
         <th>{% trans "Download" %}</th>
-        {% if not deid and has_media %}
+        {% if not deid %}
             <th>{% trans "Download Multimedia" %}</th>
         {% endif %}
         <th>
@@ -66,7 +66,7 @@
                    data-bind="click: requestDownload"
                    class="dl-export btn btn-primary"><i class="icon-download-alt icon-white"></i> {% trans "Download" %}</a>
             </td>
-            {% if not deid and has_media %}
+            {% if not deid %}
                 <td class="cell-vertical-centered">
                     {% with property_hash|dict_lookup:export.name as properties %}
                       {% if properties.size %}

diff --git a/corehq/apps/reports/templates/reports/reportdata/excel_export_data.html b/corehq/apps/reports/templates/reports/reportdata/excel_export_data.html
@@ -183,9 +183,7 @@ <h2>{% trans "Export Full Forms" %}</h2>
             <th>{% trans "Form" %}</th>
             <th>{% trans "Custom Export" %}</th>
             <th>{% trans "Download" %}</th>
-            {% if has_media %}
             <th>{% trans "Download Multimedia" %}</th>
-            {% endif %}
             <th>{% trans "Total Submissions" %}</th>
             <th>
                 {% trans "Add to Bulk Export" %} <i class="bulk-export-info icon-white icon-info-sign"></i>
@@ -300,7 +298,6 @@ <h6>{% trans "No suggestions" %}</h6>
                         {% trans "No Forms" %}
                     {% endif %}
                 </td>
-                {% if has_media %}
                 <td class="cell-vertical-centered">
                     {% if form.size %}
                         {% if form.app.id %}
@@ -316,7 +313,6 @@ <h6>{% trans "No suggestions" %}</h6>
                         <span class="label">{% trans "No Multimedia" %}</span>
                     {% endif %}
                 </td>
-                {% endif %}
                 <td>
                     {{ form.submissions }} {% if form.submissions %}
                     <i class="icon-info-sign all-users-all-time">