Merge "Implement admin_filter_first in Instances and Images Admin Views"

2016-06-29 21:47:36 +00:00
parent c8df6159d9 488efd784f
commit c1d4cc318f
10 changed files with 97 additions and 4 deletions
--- a/horizon/templates/horizon/common/_data_table.html
+++ b/horizon/templates/horizon/common/_data_table.html
@@ -46,7 +46,11 @@
      {{ row.render }}
    {% empty %}
    <tr class="{% cycle 'odd' 'even' %} empty">
-      <td colspan="{{ columns|length }}">{{ table.get_empty_message }}</td>
+      {% if table.needs_filter_first %}
+        <td colspan="{{ columns|length }}">{{ table.get_filter_first_message }}</td>
+      {% else %}
+        <td colspan="{{ columns|length }}">{{ table.get_empty_message }}</td>
+      {% endif  %}
    </tr>
    {% endfor %}
    </tbody>