diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-10-20 17:24:15 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-10-20 17:24:15 +0200 |
| commit | bee0c11ef7fdd2f289b1b5d33bf4574e519d8fcf (patch) | |
| tree | f763f9a855c0ab0b02f944c88ff6713bbbe3f34f /addons/hw_proxy/controllers/main.py | |
| parent | 8096162beeed30debcb1c3945e7f9cee35710666 (diff) | |
| parent | f3ac68ed29a478b8f092a3bc8523df171312a636 (diff) | |
[MERGE] forward port branch saas-14 up to f3ac68ed29a
Diffstat (limited to 'addons/hw_proxy/controllers/main.py')
| -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 cd90ffd16ed..d79d4bdf8be 100644 --- a/addons/hw_proxy/controllers/main.py +++ b/addons/hw_proxy/controllers/main.py @@ -17,9 +17,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 ]) @@ -106,7 +106,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: |