diff options
Diffstat (limited to 'tuskar_ui/infrastructure/resource_management')
5 files changed, 12 insertions, 14 deletions
diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py b/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py index 69a7c72a..c8eecef9 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py @@ -99,7 +99,7 @@ class RacksFilterAction(tables.FilterAction): class RacksTable(racks_tables.RacksTable): class Meta: - name = "racks" + name = "racks_table" verbose_name = _("Racks") table_actions = (RacksFilterAction,) @@ -194,7 +194,7 @@ class FlavorsTable(tables.DataTable): max_vms = tables.Column("max_vms", verbose_name=_("Max. VMs")) class Meta: - name = "flavors" + name = "flavors_table" verbose_name = _("Flavors") table_actions = (FlavorsFilterAction, UpdateFlavorsClass) diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/tabs.py b/tuskar_ui/infrastructure/resource_management/resource_classes/tabs.py index c5407fd0..f1793159 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/tabs.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/tabs.py @@ -40,7 +40,7 @@ class RacksTab(tabs.TableTab): template_name = ("infrastructure/resource_management/resource_classes/" "_detail_racks.html") - def get_racks_data(self): + def get_racks_table_data(self): try: resource_class = self.tab_group.kwargs['resource_class'] racks = resource_class.list_racks @@ -56,17 +56,17 @@ class FlavorsTab(tabs.TableTab): name = _("Flavors") slug = "flavors" template_name = ("infrastructure/resource_management/resource_classes/" - "_detail_flavors.html") + "_detail_flavors.html") - def get_flavors_data(self): + def get_flavors_table_data(self): try: resource_class = self.tab_group.kwargs['resource_class'] - racks = resource_class.list_flavors + flavors = resource_class.list_flavors except Exception: - racks = [] + flavors = [] exceptions.handle(self.tab_group.request, _('Unable to retrieve flavor list.')) - return racks + return flavors def allowed(self, request): resource_class = self.tab_group.kwargs['resource_class'] diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py b/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py index 7e9645a8..69594924 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/tests.py @@ -351,10 +351,8 @@ class ResourceClassViewTests(test.BaseAdminViewTests): 'detail', args=[resource_class.id]) res = self.client.get(url) - self.assertItemsEqual(res.context['flavors_table'].data, - flavors) - self.assertItemsEqual(res.context['racks_table'].data, - racks) + self.assertItemsEqual(res.context['flavors_table_table'].data, flavors) + self.assertItemsEqual(res.context['racks_table_table'].data, racks) self.assertEqual(res.status_code, 200) self.assertTemplateUsed(res, 'infrastructure/resource_management/resource_classes/detail.html') diff --git a/tuskar_ui/infrastructure/resource_management/templates/resource_management/resource_classes/_detail_flavors.html b/tuskar_ui/infrastructure/resource_management/templates/resource_management/resource_classes/_detail_flavors.html index 87aabcfa..34226ea9 100644 --- a/tuskar_ui/infrastructure/resource_management/templates/resource_management/resource_classes/_detail_flavors.html +++ b/tuskar_ui/infrastructure/resource_management/templates/resource_management/resource_classes/_detail_flavors.html @@ -1 +1 @@ -{{ flavors_table.render }} +{{ flavors_table_table.render }} diff --git a/tuskar_ui/infrastructure/resource_management/templates/resource_management/resource_classes/_detail_racks.html b/tuskar_ui/infrastructure/resource_management/templates/resource_management/resource_classes/_detail_racks.html index 3d8331ac..b5d73097 100644 --- a/tuskar_ui/infrastructure/resource_management/templates/resource_management/resource_classes/_detail_racks.html +++ b/tuskar_ui/infrastructure/resource_management/templates/resource_management/resource_classes/_detail_racks.html @@ -1 +1 @@ -{{ racks_table.render }} +{{ racks_table_table.render }} |