[checkmk-commits] 4049 FIX Fixed cut-off of bulk options when row-limit is reached.

Module: check_mk Branch: master Commit: dfd0a0c27789f34c34f1ae0c4c1ec5b3bff930a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfd0a0c27789f3… Author: Roland Halbig &lt;rh(a)mathias-kettner.de&gt; Date: Tue Feb 7 11:37:32 2017 +0100 4049 FIX Fixed cut-off of bulk options when row-limit is reached. Change-Id: I16c3c6fadb1160586eade1e7f5296993af8c7714 --- .werks/4049 | 9 +++++++++ ChangeLog | 1 + web/htdocs/table.py | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4049 b/.werks/4049 new file mode 100644 index 0000000..a4b7be6 --- /dev/null +++ b/.werks/4049 @@ -0,0 +1,9 @@ +Title: Fixed cut-off of bulk options when row-limit is reached. +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1486463810 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index d420aee..d724b13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,7 @@ * 4316 FIX: Views: Fixed editing of "hide from sidebar" and "show context button" options * 4321 FIX: LDAP: Improved validation of groups to attributes sync plugin * 4048 FIX: Fixed bug in tables: the notification message for reached row limits is visible again + * 4049 FIX: Fixed cut-off of bulk options when row-limit is reached. WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 4f5184d..175e311 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -177,7 +177,8 @@ def end(): num_rows_unlimited = len(rows) limit = table['limit'] if limit is not None: - rows = rows[:limit] + # only use rows up to the limit plus the fixed rows + rows = [ rows[i] for i in range(num_rows_unlimited) if i < limit or rows[i][3]] # Render header _write_table(table, rows, actions_enabled, actions_visible, search_term)