diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-06-25 22:07:52 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-06-25 22:07:52 +0000 |
commit | 513f0da17bc4714d8c93209dd71c1f52c2713a8b (patch) | |
tree | 45fbf95c9f73dd03a8120a53902ea4c447e7861e | |
parent | 092de7cfa10cf99f10327ad1f46f6b58aacf7831 (diff) | |
parent | dc077378d25d752278ad85369ff1bc0fc92cf12e (diff) | |
download | tuskar-ui-513f0da17bc4714d8c93209dd71c1f52c2713a8b.tar.gz |
Merge "Rename node detail url name"
-rw-r--r-- | tuskar_ui/infrastructure/nodes/tables.py | 2 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/nodes/tests.py | 2 | ||||
-rw-r--r-- | tuskar_ui/infrastructure/nodes/urls.py | 2 | ||||
-rw-r--r-- | 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<node_uuid>[^/]+)/$', views.DetailView.as_view(), - name='detail'), + name='node_detail'), urls.url(r'^(?P<node_uuid>[^/]+)/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 %} <tr> <td> - <a href="{% url 'horizon:infrastructure:nodes:detail' d.node_uuid %}"> + <a href="{% url 'horizon:infrastructure:nodes:node_detail' d.node_uuid %}"> {{ d.node_uuid|truncatechars:6 }} </a> </td> |