[checkmk-commits] Inventory: Attributes can now have a keyorder

Module: check_mk Branch: master Commit: 83d47f49aa605b1ac51f6da3c98fc8bbb17c135b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=83d47f49aa605b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon May 28 07:52:33 2018 +0200 Inventory: Attributes can now have a keyorder Change-Id: I4bab97fc6a5c9d2f41ecccb5305ddacdc6adbf3c --- web/plugins/views/inventory.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index 6f223db..3268f69 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -1754,8 +1754,24 @@ class NodeRenderer(object): def show_attributes(self, attributes, path=None): invpath = ".%s" % self._get_raw_path(path) + hint = _inv_display_hint(invpath) + + def _sort_attributes(item): + """Sort the attributes by the configured key order. In case no key order + is given sort by the key. In case there is a key order and a key is not + in the list, put it at the end and sort all of those by key.""" + key = item[0] + keyorder = hint.get("keyorder") + if not keyorder: + return key + + try: + return keyorder.index(key) + except ValueError: + return len(keyorder) + 1, key + html.open_table() - for key, value in attributes.get_child_data().iteritems(): + for key, value in sorted(attributes.get_child_data().iteritems(), key=_sort_attributes): sub_invpath = "%s.%s" % (invpath, key) icon, title = inv_titleinfo(sub_invpath, key) hint = _inv_display_hint(sub_invpath)