From ee9ac669a7504584c3521d1faed62102d8b45ccb Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Fri, 20 Feb 2015 14:51:02 +0100 Subject: [PATCH] Inherit from node/urls.py and extend it Change-Id: I938885ef7c1f2af449ee7efa6f75d84c27264299 --- tuskar_sat_ui/nodes/urls.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/tuskar_sat_ui/nodes/urls.py b/tuskar_sat_ui/nodes/urls.py index 1257ffe..341189c 100644 --- a/tuskar_sat_ui/nodes/urls.py +++ b/tuskar_sat_ui/nodes/urls.py @@ -13,22 +13,13 @@ # under the License. from django.conf import urls -from tuskar_ui.infrastructure.nodes import views +from tuskar_ui.infrastructure.nodes import urls as tuskar_urls from tuskar_sat_ui.nodes import views as sat_views -urlpatterns = urls.patterns( - '', - urls.url(r'^$', views.IndexView.as_view(), name='index'), - urls.url(r'^register/$', views.RegisterView.as_view(), - name='register'), - urls.url(r'^auto-discover-csv/$', views.UploadView.as_view(), - name='auto-discover-csv'), - urls.url(r'^nodes_performance/$', - views.PerformanceView.as_view(), name='nodes_performance'), +urlpatterns = [url for url in tuskar_urls.urlpatterns if url.name != 'detail'] +urlpatterns.extend(urls.patterns( urls.url(r'^(?P[^/]+)/$', sat_views.DetailView.as_view(), name='detail'), - urls.url(r'^(?P[^/]+)/performance/$', - views.PerformanceView.as_view(), name='performance'), -) +))