mirror of
https://github.com/Icinga/icingaweb2.git
synced 2025-05-17 21:20:12 +02:00
666bdfb4c4
This reverts PR 6ea012af7e0fe409ecbff2b1e455d237a5f44d69, reversing changes made to be5b9f870b5124df4516dfac39383810efec6899. The reverted commit fixed a double query execution bug by only executing the query once in either SimpleQuery::hasResult() or upon iteration. But the fix (b20291a60) introduced two problems: * Default sort rules no longer work * Show more links missing We work with DataView objects in our controllers and views. When iterating over a DataView, it applies its default sort rules and then returns the underlying query, see DataView::getIterator(). DataView::hasResult() on the other hand does not apply the default sort rules. So, if hasResult() is called first, the default sort rules are no longer applied because the query will be executed only once. The fix would be as easy as to apply sorting in DataView::hasResult() as well. But now the show more part kicks in. We know whether there are more results because we execute queries with $limit + 1. This is enabled via SimpleQuery::peekAhead(). Unfortunately, we call SimpleQuery::peekAhead() ALWAYS after SimpleQuery::hasResult(). And that's why the show more links are missing because the query is executed only once with the "wrong" limit. For now, we just revert the commit in question and postpone a proper fix for the double execution.