From 8c7ab7583518588b6e9a2c5c7765d222048d56ca Mon Sep 17 00:00:00 2001 From: nucleogenic Date: Sat, 3 Sep 2022 17:39:14 +0100 Subject: [PATCH] Update web UI following SASI removal; clean up references to SAHD in Python sources --- python/common/src/rascsi/ractl_cmds.py | 1 - .../ctrlboard_menu_update_event_handler.py | 2 +- python/web/src/translations/es/LC_MESSAGES/messages.po | 4 ++-- python/web/src/web.py | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/python/common/src/rascsi/ractl_cmds.py b/python/common/src/rascsi/ractl_cmds.py index d505901e..4cc9c37a 100644 --- a/python/common/src/rascsi/ractl_cmds.py +++ b/python/common/src/rascsi/ractl_cmds.py @@ -48,7 +48,6 @@ class RaCtlCmds: # Creates lists of file endings recognized by RaSCSI mappings = result.server_info.mapping_info.mapping - sahd = [] schd = [] scrm = [] scmo = [] diff --git a/python/ctrlboard/src/ctrlboard_event_handler/ctrlboard_menu_update_event_handler.py b/python/ctrlboard/src/ctrlboard_event_handler/ctrlboard_menu_update_event_handler.py index 4cb04736..21909815 100644 --- a/python/ctrlboard/src/ctrlboard_event_handler/ctrlboard_menu_update_event_handler.py +++ b/python/ctrlboard/src/ctrlboard_event_handler/ctrlboard_menu_update_event_handler.py @@ -247,7 +247,7 @@ class CtrlBoardMenuUpdateEventHandler(Observer): device_type = device_info["device_list"][0]["device_type"] image = device_info["device_list"][0]["image"] - if device_type in ("SAHD", "SCHD", "SCBR", "SCDP", "SCLP", "SCHS"): + if device_type in ("SCHD", "SCBR", "SCDP", "SCLP", "SCHS"): result = self.ractl_cmd.detach_by_id(scsi_id) if result["status"] is True: self.show_id_action_message(scsi_id, "detached") diff --git a/python/web/src/translations/es/LC_MESSAGES/messages.po b/python/web/src/translations/es/LC_MESSAGES/messages.po index 7159cceb..29b7bf92 100644 --- a/python/web/src/translations/es/LC_MESSAGES/messages.po +++ b/python/web/src/translations/es/LC_MESSAGES/messages.po @@ -1282,10 +1282,10 @@ msgstr "Apagar la Raspberry Pi" #~ msgstr "Liberar la reserva" #~ msgid "" -#~ "Types: SAHD = SASI HDD | SCHD = SCSI HDD | SCRM = Removable | SCMO = Magneto-" +#~ "Types: SCHD = SCSI HDD | SCRM = Removable | SCMO = Magneto-" #~ "Optical | SCCD = CD-ROM | SCBR = Host Bridge | SCDP = DaynaPORT" #~ msgstr "" -#~ "Tipos: SAHD = SASI HDD | SCHD = SCSI HDD | SCRM = extraíble | SCMO = magneto-" +#~ "Tipos: SCHD = SCSI HDD | SCRM = extraíble | SCMO = magneto-" #~ "optico | SCCD = CD-ROM | SCBR = Host Bridge | SCDP = DaynaPORT" #~ msgid "Attach Ethernet Adapter" diff --git a/python/web/src/web.py b/python/web/src/web.py index c3a93b1f..22e1084b 100644 --- a/python/web/src/web.py +++ b/python/web/src/web.py @@ -134,7 +134,6 @@ def index(): formatted_devices = sort_and_format_devices(devices["device_list"]) valid_image_suffixes = "." + ", .".join( - server_info["sahd"] + server_info["schd"] + server_info["scrm"] + server_info["scmo"] +