summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/minimaws/lib/wsgiserve.py
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-08-02 20:00:12 +1000
committer Vas Crabb <vas@vastheman.com>2017-08-02 20:13:13 +1000
commitc85c7c4c15fb85b98e06667b72edda2c93cf1a92 (patch)
tree7b89d1e96a7a17249fa7d5af6f698e76535f7bd8 /scripts/minimaws/lib/wsgiserve.py
parentbcef3c04451c7e8884691bcb99eb129c5073e4c8 (diff)
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.
Diffstat (limited to 'scripts/minimaws/lib/wsgiserve.py')
-rw-r--r--scripts/minimaws/lib/wsgiserve.py5
1 files changed, 3 insertions, 2 deletions
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 '</table>\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 \
'<h2>Devices Referenced</h2>\n' \
@@ -178,7 +179,7 @@ class MachineHandler(QueryPageHandler):
yield ' </tbody>\n</table>\n<script>make_table_sortable(document.getElementById("tbl-dev-refs"));</script>\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 \
'<h2>Referenced By</h2>\n' \