diff --git a/owrx/client.py b/owrx/client.py index 1c5bab1a..793b4a6c 100644 --- a/owrx/client.py +++ b/owrx/client.py @@ -136,6 +136,8 @@ class ClientRegistry(object): if c.sdr is not None: entry["sdr"] = c.sdr.getName() entry["band"] = c.sdr.getProfileName() + if c in self.chat: + entry["name"] = self.chat[c]["name"] result.append(entry) # Flush out stale bans self.expireBans() diff --git a/owrx/controllers/clients.py b/owrx/controllers/clients.py index fd930fe0..67ed0eb5 100644 --- a/owrx/controllers/clients.py +++ b/owrx/controllers/clients.py @@ -25,12 +25,14 @@ class ClientController(AuthorizationMixin, WebpageController): + {clients} + ".format( + return "".format( ClientController.renderIp(c["ip"]), + c["name"] if "name" in c else "", "banned" if c["ban"] else c["sdr"] + " " + c["band"] if "sdr" in c else "n/a", "until" if c["ban"] else "since", c["ts"].strftime('%H:%M:%S'),
IP AddressChat Name SDR Profile Local Time Actions
@@ -53,8 +55,9 @@ class ClientController(AuthorizationMixin, WebpageController): @staticmethod def renderClient(c): - return "
{0}{1}{2} {3}{4}
{0}{1}{2}{3} {4}{5}