From 53dee2cf611be9c8b33d169cbb5666af38f1be44 Mon Sep 17 00:00:00 2001 From: Shu Muto Date: Mon, 26 Dec 2016 13:07:53 +0900 Subject: [PATCH] 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 --- magnum_ui/content/cluster_templates/urls.py | 6 +++--- magnum_ui/content/cluster_templates/views.py | 19 ------------------- magnum_ui/content/clusters/urls.py | 6 +++--- magnum_ui/content/clusters/views.py | 19 ------------------- 4 files changed, 6 insertions(+), 44 deletions(-) delete mode 100644 magnum_ui/content/cluster_templates/views.py delete mode 100644 magnum_ui/content/clusters/views.py diff --git a/magnum_ui/content/cluster_templates/urls.py b/magnum_ui/content/cluster_templates/urls.py index bdabefe1..433e834e 100644 --- a/magnum_ui/content/cluster_templates/urls.py +++ b/magnum_ui/content/cluster_templates/urls.py @@ -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'), ] diff --git a/magnum_ui/content/cluster_templates/views.py b/magnum_ui/content/cluster_templates/views.py deleted file mode 100644 index 6ea33c5a..00000000 --- a/magnum_ui/content/cluster_templates/views.py +++ /dev/null @@ -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' diff --git a/magnum_ui/content/clusters/urls.py b/magnum_ui/content/clusters/urls.py index 1b284a8f..433e834e 100644 --- a/magnum_ui/content/clusters/urls.py +++ b/magnum_ui/content/clusters/urls.py @@ -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'), ] diff --git a/magnum_ui/content/clusters/views.py b/magnum_ui/content/clusters/views.py deleted file mode 100644 index 6ea33c5a..00000000 --- a/magnum_ui/content/clusters/views.py +++ /dev/null @@ -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'