diff options
3 files changed, 8 insertions, 6 deletions
diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py b/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py index da618455..d1228923 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/tables.py @@ -18,10 +18,11 @@ from django.core import urlresolvers from django.utils.translation import ugettext_lazy as _ from horizon import exceptions -from horizon import forms from horizon import tables from tuskar_ui import api +import tuskar_ui.tables +from tuskar_ui.forms import NumberInput from tuskar_ui.infrastructure. \ resource_management.flavors import tables as flavors_tables @@ -98,10 +99,10 @@ class FlavorsFilterAction(tables.FilterAction): class FlavorsTable(flavors_tables.FlavorsTable): name = tables.Column('name', verbose_name=_('Flavor Name')) - max_vms = tables.Column("max_vms", + max_vms = tuskar_ui.tables.Column("max_vms", auto='form_widget', verbose_name=_("Max. VMs"), - form_widget=forms.NumberInput(), + form_widget=NumberInput(), form_widget_attributes={ 'class': "number_input_slim"}) diff --git a/tuskar_ui/infrastructure/resource_management/resource_classes/workflows.py b/tuskar_ui/infrastructure/resource_management/resource_classes/workflows.py index 91cebb61..31e6b3be 100644 --- a/tuskar_ui/infrastructure/resource_management/resource_classes/workflows.py +++ b/tuskar_ui/infrastructure/resource_management/resource_classes/workflows.py @@ -21,6 +21,7 @@ from horizon import forms from horizon import workflows from tuskar_ui import api +import tuskar_ui.workflows import re @@ -83,7 +84,7 @@ class ResourceClassInfoAndFlavorsAction(workflows.Action): "settings and add flavors to class.") -class CreateResourceClassInfoAndFlavors(workflows.TableStep): +class CreateResourceClassInfoAndFlavors(tuskar_ui.workflows.TableStep): table_classes = (FlavorsTable,) action_class = ResourceClassInfoAndFlavorsAction @@ -139,7 +140,7 @@ class RacksAction(workflows.Action): name = _("Racks") -class CreateRacks(workflows.TableStep): +class CreateRacks(tuskar_ui.workflows.TableStep): table_classes = (RacksTable,) action_class = RacksAction diff --git a/tuskar_ui/infrastructure/resource_management/tabs.py b/tuskar_ui/infrastructure/resource_management/tabs.py index 8c88977c..0d0d0369 100644 --- a/tuskar_ui/infrastructure/resource_management/tabs.py +++ b/tuskar_ui/infrastructure/resource_management/tabs.py @@ -19,7 +19,7 @@ from django.utils.translation import ugettext_lazy as _ from horizon import exceptions from horizon import tabs -from openstack_dashboard.api import tuskar +from tuskar_ui import api as tuskar from tuskar_ui.infrastructure. \ resource_management.flavors.tables import FlavorsTable from tuskar_ui.infrastructure. \ |