openstack
/
octavia-dashboard
Code Issues Proposed changes

Merge "Fix URL patterns"

This commit is contained in:
Jenkins 2017-07-24 16:34:03 +00:00 committed by Gerrit Code Review
parent 40262487aa 6c60245c29
commit 7b6f33e50e
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
octavia_dashboard/dashboards/project/loadbalancersv2/urls.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls import patterns
from django.conf.urls import url
from .views import DetailView # noqa
@ -22,15 +21,14 @@ from .views import UpdateView # noqa
INSTANCES = r'^(?P<loadbalancer_id>[^/]+)/%s$'
VIEW_MOD = 'openstack_dashboard.dashboards.project.loadbalancersv2.views'
urlpatterns = patterns(VIEW_MOD,
url(r'^$', IndexView.as_view(), name='index'),
url(r'^launch$',
LaunchLoadBalancerView.as_view(), name='launch'),
url(r'^(?P<loadbalancer_id>[^/]+)/$',
DetailView.as_view(), name='detail'),
url(INSTANCES %
'update', UpdateView.as_view(), name='update'),
)
urlpatterns = [
url(r'^$', IndexView.as_view(), name='index'),
url(r'^launch$',
LaunchLoadBalancerView.as_view(), name='launch'),
url(r'^(?P<loadbalancer_id>[^/]+)/$',
DetailView.as_view(), name='detail'),
url(INSTANCES %
'update', UpdateView.as_view(), name='update'),
]

6
octavia_dashboard/dashboards/project/ngloadbalancersv2/urls.py
View File

@ -12,13 +12,11 @@
# License for the specific language governing permissions and limitations
# under the License.
from django.conf.urls import patterns
from django.conf.urls import url
from octavia_dashboard.dashboards.project.ngloadbalancersv2 import views
urlpatterns = patterns(
'octavia_dashboard.dashboards.project.ngloadbalancersv2.views',
urlpatterns = [
url('', views.IndexView.as_view(), name='index'),
)
]