From 331ed44c5817f4a1baef0204c4a733395e3502f5 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 8 Aug 2018 03:25:58 +0100 Subject: [PATCH 1/8] Add Stage One International Co., Ltd. link --- data/manufacturer_links.py | 1 + 1 file changed, 1 insertion(+) diff --git a/data/manufacturer_links.py b/data/manufacturer_links.py index 53850400..958b1dfa 100644 --- a/data/manufacturer_links.py +++ b/data/manufacturer_links.py @@ -52,6 +52,7 @@ (0x0776, "http://lumenetix.com/"), (0x07C0, "https://www.codemercs.com/"), (0x0808, "http://zero88.com/"), + (0x088E, "https://www.stage1.com.tw/"), (0x089D, "http://www.gobo.ws/"), (0x08A4, "https://www.adamhall.com/"), (0x08C5, "https://ehrgeiz.com/"), From 9fe7483b7f7e31af2ad3d7b0a95711691361c12a Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 8 Aug 2018 11:41:11 +0100 Subject: [PATCH 2/8] Stop an error in the logs --- admin.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/admin.py b/admin.py index 90694464..c662008b 100644 --- a/admin.py +++ b/admin.py @@ -539,6 +539,8 @@ def HandleRequest(self): class ResponderModerator(BaseAdminPageHandler): """Displays the UI for moderating responder data.""" def EvalData(self, data): + if not data: + return {} try: evaled_data = eval(data, {}) return evaled_data From 0cc6b5471d6b301ff182cf1ec1caefe86c5e2f2c Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 8 Aug 2018 11:57:57 +0100 Subject: [PATCH 3/8] Allow HTTPS URLs too --- contrib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib.py b/contrib.py index e8369f49..fbc5dd4a 100644 --- a/contrib.py +++ b/contrib.py @@ -107,7 +107,8 @@ def BuildResponderList(self, responders): def GetURLOrNone(self, param): url = self.request.get(param) - if not url or not url.startswith('http://'): + if not url or not (url.startswith('http://') or + url.startswith('https://')): return None return url From b657b10372eb5f0759ae299b744ce863cb21f5a4 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Thu, 9 Aug 2018 03:39:20 +0100 Subject: [PATCH 4/8] Add link to another ESTA ID --- data/manufacturer_links.py | 1 + 1 file changed, 1 insertion(+) diff --git a/data/manufacturer_links.py b/data/manufacturer_links.py index 958b1dfa..9e8775f7 100644 --- a/data/manufacturer_links.py +++ b/data/manufacturer_links.py @@ -60,6 +60,7 @@ (0x097A, "http://teamboyce.com/"), (0x097F, "https://raumzeitlabor.de/"), (0x0987, "https://www.mathertel.de/"), + (0x1234, "http://tsp.esta.org/tsp/working_groups/cp.html"), (0x15D0, "https://www.musiclights.it/"), # (0x15D0, "http://prolights.it/"), # This is one of their sub-brands (0x16FA, "http://www.liteputer.com.tw/"), From e547e99944ab93af9dea4edaaf0c9b270c151211 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 15 Aug 2018 14:01:07 +0100 Subject: [PATCH 5/8] Add Aquarii, Inc. URL --- data/manufacturer_links.py | 1 + 1 file changed, 1 insertion(+) diff --git a/data/manufacturer_links.py b/data/manufacturer_links.py index 9e8775f7..a06266f4 100644 --- a/data/manufacturer_links.py +++ b/data/manufacturer_links.py @@ -82,6 +82,7 @@ (0x3638, "https://www.lumenpulse.com/"), (0x4144, "https://www.adbstagelight.com/"), (0x414C, "https://www.artisticlicence.com/"), + (0x4151, "http://aquariitech.com/"), (0x4179, "https://www.ayrton.eu/"), (0x434D, "http://www.coemar.com/"), (0x4350, "https://www.claypaky.it/"), From 6645197c756dfa3f5c42adef1ada0a0524453785 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 9 Sep 2018 18:54:57 +0100 Subject: [PATCH 6/8] Add iGuzzini illuminazione S.p.A URL --- data/manufacturer_links.py | 1 + 1 file changed, 1 insertion(+) diff --git a/data/manufacturer_links.py b/data/manufacturer_links.py index a06266f4..0c78377f 100644 --- a/data/manufacturer_links.py +++ b/data/manufacturer_links.py @@ -93,6 +93,7 @@ (0x4658, "http://www.magicfx.eu/"), (0x4744, "http://www.goddarddesign.com/"), (0x4845, "http://www.helluk.com/"), + (0x4947, "https://www.iguzzini.com/"), (0x4953, "https://www.istl.com/"), (0x4A54, "http://jthomaseng.com/"), (0x4A61, "http://www.jands.com.au/"), From f2ffa52b26bb81c062677c757da10b9111f8d361 Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Tue, 18 Sep 2018 03:42:24 +0100 Subject: [PATCH 7/8] Update DMX USB Pro URL --- data/controller_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/controller_data.py b/data/controller_data.py index 57121600..8f827c8d 100644 --- a/data/controller_data.py +++ b/data/controller_data.py @@ -107,7 +107,7 @@ ], 0x454E: [ {'name': 'DMX USB Pro', - 'link': 'https://www.enttec.com/products/controls/dmx-usb/dmx-usb-pro/', + 'link': 'https://www.enttec.com/products/controls/usb/2-universe-usb-computer-interface-dmx/', 'image_url': 'http://www.enttec.com/img/dmxusbpro/flip.gif', 'tags': ['tool', 'USB']}, {'name': 'RDM USB Pro', From 092209824630a99f2181db4246874435f09b5e8f Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Sun, 23 Sep 2018 01:47:10 +0100 Subject: [PATCH 8/8] Display a more friendly title if we don't have a model description --- templates/display_model.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/display_model.tmpl b/templates/display_model.tmpl index 3aef2c9f..0e173c09 100644 --- a/templates/display_model.tmpl +++ b/templates/display_model.tmpl @@ -1,6 +1,6 @@ {% extends "base.tmpl" %} -{% block title %}{{ manufacturer }} - {{ description }}{% endblock %} +{% block title %}{{ manufacturer }} - {% if description %}{{ description }}{% else %}Model ID {{ model_id }}{% endif %}{% endblock %} {% block content %}