diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/tabs.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/tabs.py index 301234a8..88b3d320 100644 --- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/tabs.py +++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/tabs.py @@ -1,5 +1,5 @@ # -# Copyright (c) 2013-2018 Wind River Systems, Inc. +# Copyright (c) 2013-2024 Wind River Systems, Inc. # # SPDX-License-Identifier: Apache-2.0 # @@ -18,14 +18,14 @@ from starlingx_dashboard.dashboards.admin.software_management import \ LOG = logging.getLogger(__name__) -class PatchesTab(tabs.TableTab): +class ReleasesTab(tabs.TableTab): table_classes = (toplevel_tables.PatchesTable,) - name = _("Patches") - slug = "patches" - template_name = ("admin/software_management/_patches.html") + name = _("Releases") + slug = "releases" + template_name = "admin/software_management/_releases.html" def get_context_data(self, request): - context = super(PatchesTab, self).get_context_data(request) + context = super(ReleasesTab, self).get_context_data(request) phosts = [] try: @@ -39,16 +39,16 @@ class PatchesTab(tabs.TableTab): return context - def get_patches_data(self): + def get_releases_data(self): request = self.request - patches = [] + releases = [] try: - patches = stx_api.patch.get_patches(request) + releases = stx_api.patch.get_patches(request) except Exception: exceptions.handle(self.request, - _('Unable to retrieve patch list.')) + _('Unable to retrieve release list.')) - return patches + return releases class PatchOrchestrationTab(tabs.TableTab): @@ -137,5 +137,5 @@ class UpgradeOrchestrationTab(tabs.TableTab): class SoftwareManagementTabs(tabs.TabGroup): slug = "software_management_tabs" - tabs = (PatchesTab, PatchOrchestrationTab, UpgradeOrchestrationTab) + tabs = (ReleasesTab, PatchOrchestrationTab, UpgradeOrchestrationTab) sticky = True diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/templates/software_management/_patches.html b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/templates/software_management/_releases.html similarity index 96% rename from starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/templates/software_management/_patches.html rename to starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/templates/software_management/_releases.html index 11fbb2bb..a76c23db 100644 --- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/templates/software_management/_patches.html +++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/admin/software_management/templates/software_management/_releases.html @@ -1,20 +1,20 @@ -{% load i18n sizeformat %} - -{% block main %} -
-
- - {% if patch_current %} - {% trans "System is Patch Current" %} - {% else %} - {% trans "System is Not Patch Current" %} - {% endif %} - -
- - {{ patches_table.render }} -
-{% endblock %} - - - +{% load i18n sizeformat %} + +{% block main %} +
+
+ + {% if patch_current %} + {% trans "System is Patch Current" %} + {% else %} + {% trans "System is Not Patch Current" %} + {% endif %} + +
+ + {{ patches_table.render }} +
+{% endblock %} + + + diff --git a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_software_management/tabs.py b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_software_management/tabs.py index 073402b1..d7932c71 100644 --- a/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_software_management/tabs.py +++ b/starlingx-dashboard/starlingx-dashboard/starlingx_dashboard/dashboards/dc_admin/dc_software_management/tabs.py @@ -21,7 +21,7 @@ class PatchesTab(tabs.TableTab): table_classes = (tables.PatchesTable,) name = _("Patches") slug = "patches" - template_name = ("dc_admin/dc_software_management/_patches.html") + template_name = ("dc_admin/dc_software_management/_releases.html") preload = False def get_dc_patches_data(self):