Module: check_mk
Branch: master
Commit: cd9418aff42e6c17766ef049de4117bff714d861
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd9418aff42e6c…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Jan 3 10:28:15 2019 +0100
Simplified headinfo handling.
Change-Id: I8405e3dadd7d79dbfdfb2c9743906d39f34717ba
---
cmk/gui/table.py | 10 ++--------
cmk/gui/werks.py | 12 +++---------
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/cmk/gui/table.py b/cmk/gui/table.py
index 780359b..fcc9b2a 100644
--- a/cmk/gui/table.py
+++ b/cmk/gui/table.py
@@ -45,11 +45,6 @@ def open_table(table_id=None, title=None, **kwargs):
table.end()
-def update_headinfo(num_rows):
- headinfo = _("1 row") if num_rows == 1 else _("%d rows") %
num_rows
- html.javascript("cmk.utils.update_header_info(%s);" %
json.dumps(headinfo))
-
-
#.
# .--Table---------------------------------------------------------------.
# | _____ _ _ |
@@ -100,7 +95,6 @@ class Table(object):
"searchable": kwargs.get("searchable", True),
"sortable": kwargs.get("sortable", True),
"foldable": kwargs.get("foldable", False),
- "update_page_head": kwargs.get("update_page_head",
True),
"output_format": kwargs.get("output_format",
"html"), # possible: html, csv, fetch
}
@@ -288,8 +282,8 @@ class Table(object):
return rows, actions_enabled, actions_visible, search_term, user_opts
def _write_table(self, rows, actions_enabled, actions_visible, search_term):
- if self.options["update_page_head"]:
- update_headinfo(len(rows))
+ headinfo = _("1 row") if len(rows) == 1 else _("%d rows") %
len(rows)
+ html.javascript("cmk.utils.update_header_info(%s);" %
json.dumps(headinfo))
table_id = self.id
num_cols = len(self.headers)
diff --git a/cmk/gui/werks.py b/cmk/gui/werks.py
index e52ab38..c2ddb1e 100644
--- a/cmk/gui/werks.py
+++ b/cmk/gui/werks.py
@@ -343,18 +343,12 @@ def render_werks_table():
groups = itertools.groupby(werklist, key=grouper)
for group_title, werks in itertools.islice(groups,
werk_table_options["group_limit"]):
with cmk.gui.table.open_table(
- title=group_title,
- limit=None,
- searchable=False,
- sortable=False,
- css="werks",
- update_page_head=False) as table:
+ title=group_title, limit=None, searchable=False, sortable=False,
+ css="werks") as table:
for werk in werks:
number_of_werks += 1
render_werks_table_row(table, translator, werk)
- if number_of_werks:
- cmk.gui.table.update_headinfo(number_of_werks)
- else:
+ if not number_of_werks:
html.h3(_("No matching Werks found."))