From c85c7c4c15fb85b98e06667b72edda2c93cf1a92 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 2 Aug 2017 20:00:12 +1000 Subject: Load slot info in minimaws (not exposed yet), fix up some problems with slots uncovered (nw) It seems at some point someone didn't realise that choosing the same option from a SLOT_INTERFACE in multiple slots creates multiple instances of the same device type, and this got copy/pasted everywhere. --- scripts/minimaws/lib/wsgiserve.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scripts/minimaws/lib/wsgiserve.py') diff --git a/scripts/minimaws/lib/wsgiserve.py b/scripts/minimaws/lib/wsgiserve.py index 482c9583b4e..96d03de4cfe 100644 --- a/scripts/minimaws/lib/wsgiserve.py +++ b/scripts/minimaws/lib/wsgiserve.py @@ -126,6 +126,7 @@ class MachineHandler(QueryPageHandler): return self.machine_page(machine_info) def machine_page(self, machine_info): + id = machine_info['id'] description = machine_info['description'] yield htmltmpl.MACHINE_PROLOGUE.substitute( assets=cgi.escape(urlparse.urljoin(self.application_uri, 'static'), True), @@ -163,7 +164,7 @@ class MachineHandler(QueryPageHandler): yield '\n'.encode('utf-8') first = True - for name, desc, src in self.dbcurs.get_devices_referenced(machine_info['id']): + for name, desc, src in self.dbcurs.get_devices_referenced(id): if first: yield \ '

Devices Referenced

\n' \ @@ -178,7 +179,7 @@ class MachineHandler(QueryPageHandler): yield ' \n\n\n'.encode('utf-8') first = True - for name, desc, src in self.dbcurs.get_device_references(self.shortname): + for name, desc, src in self.dbcurs.get_device_references(id): if first: yield \ '

Referenced By

\n' \ -- cgit v1.2.3-70-g09d2