openstack
/
magnum-ui
Code Issues Proposed changes

Use horizon's common "views" for Angular 

This patch replace views.py for each panel to the common views
for Angularized panel in Horizon.

Change-Id: Ic927bb640ed2fa5fb6454e6caf2e257b8b97bbc1
This commit is contained in:
Shu Muto 2016-12-26 13:07:53 +09:00
parent 5059c9b6d5
commit 53dee2cf61
4 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
magnum_ui/content/cluster_templates/urls.py
View File

@ -13,10 +13,10 @@
# under the License.
from django.conf.urls import url
from magnum_ui.content.cluster_templates import views
from horizon.browsers import views
urlpatterns = [
url(r'^[0-9a-f\-]{36}$', views.IndexView.as_view(), name='detail'),
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^[0-9a-f\-]{36}$', views.AngularIndexView.as_view(), name='detail'),
url(r'^$', views.AngularIndexView.as_view(), name='index'),
]

19
magnum_ui/content/cluster_templates/views.py
View File

@ -1,19 +0,0 @@
# Copyright 2015 Cisco Systems
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from django.views import generic
class IndexView(generic.TemplateView):
template_name = 'angular.html'

6
magnum_ui/content/clusters/urls.py
View File

@ -13,10 +13,10 @@
# under the License.
from django.conf.urls import url
from magnum_ui.content.clusters import views
from horizon.browsers import views
urlpatterns = [
url(r'^[0-9a-f\-]{36}$', views.IndexView.as_view(), name='detail'),
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^[0-9a-f\-]{36}$', views.AngularIndexView.as_view(), name='detail'),
url(r'^$', views.AngularIndexView.as_view(), name='index'),
]

19
magnum_ui/content/clusters/views.py
View File

@ -1,19 +0,0 @@
# Copyright 2015 Cisco Systems
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from django.views import generic
class IndexView(generic.TemplateView):
template_name = 'angular.html'