Machine listing name: use name field

People started moving name to comment instead.
This commit is contained in:
2025-05-25 20:35:16 +03:00
parent fbe8681a23
commit d85f49bd26

View File

@@ -76,12 +76,12 @@ def inventory_fetch(owner=True, item_type=None):
def format_name(item): def format_name(item):
if item.get("locker"): if item.get("locker"):
return "Locker %d" % item.get("locker").get("number") return "Locker %d".format(item.get("locker").get("number"))
elif item.get("mac"): elif item.get("mac"):
return "Machine %s" % item.get("hostname", item.get("mac")) return "Machine {} ({})".format(item.get("name", "unidentified"), item.get("mac"))
elif item.get("desk"): elif item.get("desk"):
return "Desk %s" % item.get("desk").get("number") return "Desk %s".format(item.get("desk").get("number"))
return item.get("name", "Unknown item") return item.get("name", "Unidentified item")
def flatten(d, parent_key='', sep='.'): def flatten(d, parent_key='', sep='.'):
items = [] items = []