openstack
/
horizon
Code Issues Proposed changes

Fix `_data_table.html` weird conditional. 

While troubleshooting a problem with pagination I noticed the
following conditional in `horizon/templates/horizon/common/_data_table.html`:

```
      {% if table.number_of_pages is defined %}
        {% include "horizon/common/_data_table_pagination.html" %}
      {% else %}
        {% include "horizon/common/_data_table_pagination_with_pages.html" %}
      {% endif %}
```

At first sight, it looks wrong. I mean, if there are
number_of_pages, we should use `_data_table_pagination_with_pages.html`.
However, this conditional solves to `True` if
table.number_of_pages is NOT defined, and then it solves to `False`,
if it is defined. It is a very weird (to me) behavior.

Therefore, I am suggesting to use a more readable and understandable
conditional in this patch.

We can simply use `if table.number_of_pages is None`, which will
behave as expected; if there are not number of pages, we use the
traditional paging, and then, if there are number of pages, we use
the paged data table approach.

Change-Id: I933b1f9399f40569c7661c1db5776d468917b966
This commit is contained in:
Rafael Weingärtner 2021-03-16 08:46:29 -03:00
parent 6ac0917950
commit 3e4d0ad77e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
horizon/templates/horizon/common/_data_table.html
View File

@ -24,7 +24,7 @@
{% endif %} {% endif %}
{% endblock table_breadcrumb %} {% endblock table_breadcrumb %}
{% if table.footer and rows %} {% if table.footer and rows %}
{% if table.number_of_pages is defined %} {% if table.number_of_pages is None %}
{% include "horizon/common/_data_table_pagination.html" %} {% include "horizon/common/_data_table_pagination.html" %}
{% else %} {% else %}
{% include "horizon/common/_data_table_pagination_with_pages.html" %} {% include "horizon/common/_data_table_pagination_with_pages.html" %}
@ -76,7 +76,7 @@
{% endfor %} {% endfor %}
</tr> </tr>
{% endif %} {% endif %}
{% if table.number_of_pages is defined %} {% if table.number_of_pages is None %}
{% include "horizon/common/_data_table_pagination.html" %} {% include "horizon/common/_data_table_pagination.html" %}
{% else %} {% else %}
{% include "horizon/common/_data_table_pagination_with_pages.html" %} {% include "horizon/common/_data_table_pagination_with_pages.html" %}