From dc077378d25d752278ad85369ff1bc0fc92cf12e Mon Sep 17 00:00:00 2001 From: Jiri Tomasek Date: Thu, 25 Jun 2015 10:18:57 +0200 Subject: Rename node detail url name Change-Id: Ie9a7eed5da1756c0f003be65e63deca4a1904141 --- tuskar_ui/infrastructure/nodes/tables.py | 2 +- tuskar_ui/infrastructure/nodes/tests.py | 2 +- tuskar_ui/infrastructure/nodes/urls.py | 2 +- tuskar_ui/infrastructure/templates/infrastructure/_top_5_chart.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tuskar_ui/infrastructure/nodes/tables.py b/tuskar_ui/infrastructure/nodes/tables.py index f4d65272..65a5cf56 100644 --- a/tuskar_ui/infrastructure/nodes/tables.py +++ b/tuskar_ui/infrastructure/nodes/tables.py @@ -163,7 +163,7 @@ def get_state_string(node): class BaseNodesTable(tables.DataTable): node = tables.Column('uuid', - link="horizon:infrastructure:nodes:detail", + link="horizon:infrastructure:nodes:node_detail", verbose_name=_("Node Name")) role_name = tables.Column('role_name', link=get_role_link, diff --git a/tuskar_ui/infrastructure/nodes/tests.py b/tuskar_ui/infrastructure/nodes/tests.py index 66ec0c7e..4f91bb9e 100644 --- a/tuskar_ui/infrastructure/nodes/tests.py +++ b/tuskar_ui/infrastructure/nodes/tests.py @@ -34,7 +34,7 @@ from tuskar_ui.test.test_data import tuskar_data INDEX_URL = urlresolvers.reverse('horizon:infrastructure:nodes:index') REGISTER_URL = urlresolvers.reverse('horizon:infrastructure:nodes:register') -DETAIL_VIEW = 'horizon:infrastructure:nodes:detail' +DETAIL_VIEW = 'horizon:infrastructure:nodes:node_detail' PERFORMANCE_VIEW = 'horizon:infrastructure:nodes:performance' TEST_DATA = utils.TestDataContainer() node_data.data(TEST_DATA) diff --git a/tuskar_ui/infrastructure/nodes/urls.py b/tuskar_ui/infrastructure/nodes/urls.py index bd8c5ca7..c75129fe 100644 --- a/tuskar_ui/infrastructure/nodes/urls.py +++ b/tuskar_ui/infrastructure/nodes/urls.py @@ -25,7 +25,7 @@ urlpatterns = urls.patterns( urls.url(r'^nodes_performance/$', views.PerformanceView.as_view(), name='nodes_performance'), urls.url(r'^(?P[^/]+)/$', views.DetailView.as_view(), - name='detail'), + name='node_detail'), urls.url(r'^(?P[^/]+)/performance/$', views.PerformanceView.as_view(), name='performance'), ) diff --git a/tuskar_ui/infrastructure/templates/infrastructure/_top_5_chart.html b/tuskar_ui/infrastructure/templates/infrastructure/_top_5_chart.html index 76136378..d4d730cf 100644 --- a/tuskar_ui/infrastructure/templates/infrastructure/_top_5_chart.html +++ b/tuskar_ui/infrastructure/templates/infrastructure/_top_5_chart.html @@ -9,7 +9,7 @@ {% for d in top_5.data %} - + {{ d.node_uuid|truncatechars:6 }} -- cgit v1.2.1