From eab1c6ce8027f68167426b7fb7b624e60d696abe Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Wed, 3 Mar 2021 15:38:15 +0100 Subject: [PATCH] remove profile list from device page; make links work --- owrx/controllers/settings/sdr.py | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/owrx/controllers/settings/sdr.py b/owrx/controllers/settings/sdr.py index 88ec33e..3c7eb54 100644 --- a/owrx/controllers/settings/sdr.py +++ b/owrx/controllers/settings/sdr.py @@ -20,14 +20,16 @@ class SdrDeviceListController(AuthorizationMixin, WebpageController): return variables def render_devices(self): - def render_profile(profile_id, profile): + def render_profile(device_id, profile_id, profile): return """
  • {profile_name}
  • """.format( profile_name=profile["name"], - profile_link="{}/{}".format(self.request.path, quote(profile_id)), + profile_link="{}settings/sdr/{}/{}".format( + self.get_document_root(), quote(device_id), quote(profile_id) + ), ) def render_device(device_id, config): @@ -74,7 +76,7 @@ class SdrDeviceListController(AuthorizationMixin, WebpageController): state="Unknown" if source is None else source.getState(), num_profiles=len(config["profiles"]), additional_info=additional_info, - profiles="".join(render_profile(p_id, p) for p_id, p in config["profiles"].items()), + profiles="".join(render_profile(device_id, p_id, p) for p_id, p in config["profiles"].items()), ) return """ @@ -128,29 +130,6 @@ class SdrDeviceController(SdrFormController): def getTitle(self): return self.device["name"] - def render_sections(self): - return super().render_sections() + self.render_profile_list(self.device["profiles"]) - - def render_profile_list(self, profiles): - def render_profile(profile_id, profile): - return """ -
  • - {profile_name} -
  • - """.format( - profile_name=profile["name"], - profile_link="{}/{}".format(self.request.path, quote(profile_id)), - ) - - return """ -

    Profiles

    - - """.format( - profiles="".join(render_profile(p_id, p) for p_id, p in profiles.items()) - ) - def indexAction(self): if self.device is None: self.send_response("device not found", code=404)