diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-10-20 17:57:21 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-10-20 17:57:21 +0200 |
| commit | 5ea0f55d654f4c4c928fa1c4ea3ebcf7d1613812 (patch) | |
| tree | ce5bb069ae0d18c882b9ed707bddf36a987bc913 /addons/hw_proxy/controllers | |
| parent | 635572b49d5b70a32b717cf2d52da49b10aac28e (diff) | |
| parent | bee0c11ef7fdd2f289b1b5d33bf4574e519d8fcf (diff) | |
[MERGE] forward port branch saas-15 up to bee0c11ef7f
Diffstat (limited to 'addons/hw_proxy/controllers')
| -rw-r--r-- | addons/hw_proxy/controllers/main.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/addons/hw_proxy/controllers/main.py b/addons/hw_proxy/controllers/main.py index f047e0145a4..8a0ee204701 100644 --- a/addons/hw_proxy/controllers/main.py +++ b/addons/hw_proxy/controllers/main.py @@ -18,9 +18,9 @@ _logger = logging.getLogger(__name__) # Those are the builtin raspberry pi USB modules, they should # not appear in the list of connected devices. BANNED_DEVICES = set([ - "0424:9514", # Standard Microsystem Corp. Builtin Ethernet module - "1d6b:0002", # Linux Foundation 2.0 root hub - "0424:ec00", # Standard Microsystem Corp. Other Builtin Ethernet module + "0424:9514", # Standard Microsystem Corp. Builtin Ethernet module + "1d6b:0002", # Linux Foundation 2.0 root hub + "0424:ec00", # Standard Microsystem Corp. Other Builtin Ethernet module ]) @@ -107,7 +107,7 @@ class Proxy(http.Controller): device_name = device[device.find('ID')+2:] device_id = device_name.split()[0] if not (device_id in BANNED_DEVICES): - resp+= "<div class='device' data-device='"+device+"'>"+device_name+"</div>\n" + resp+= "<div class='device' data-device='"+device+"'>"+device_name+"</div>\n" count += 1 if count == 0: |