[checkmk-commits] 4048 FIX Fixed bug in tables: the notification message for reached row limits is visible again

Module: check_mk Branch: master Commit: b34c6fa141d396adf4c359c3df56672125d0a84d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b34c6fa141d396… Author: Roland Halbig &lt;rh(a)mathias-kettner.de&gt; Date: Tue Feb 7 10:03:23 2017 +0100 4048 FIX Fixed bug in tables: the notification message for reached row limits is visible again Change-Id: I1c42b12b97c99b462fa7869185ae11024f6d6f9f --- .werks/4048 | 9 +++++++++ ChangeLog | 1 + web/htdocs/table.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4048 b/.werks/4048 new file mode 100644 index 0000000..41ddc21 --- /dev/null +++ b/.werks/4048 @@ -0,0 +1,9 @@ +Title: Fixed bug in tables: the notification message for reached row limits is visible again +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1486458071 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a22e79a..e0a26d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,7 @@ * 4315 FIX: Logwatch problematic logfiles list was showing too many logfiles * 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 WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 41838d0..4f5184d 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -174,6 +174,7 @@ def end(): rows, actions_enabled, actions_visible, search_term, user_opts = _evaluate_user_opts(table) # Apply limit after search / sorting etc. + num_rows_unlimited = len(rows) limit = table['limit'] if limit is not None: rows = rows[:limit] @@ -181,7 +182,6 @@ def end(): # Render header _write_table(table, rows, actions_enabled, actions_visible, search_term) - num_rows_unlimited = len(rows) if limit is not None and num_rows_unlimited > limit: html.message(_('This table is limited to show only %d of %d rows. ' 'Click <a href="%s">here</a> to disable the limitation.') %