Merge "Address RemovedInDjango40Warning"
This commit is contained in:
commit
3fc1937949
|
@ -12,7 +12,7 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from django.conf.urls import url
|
from django.urls import re_path
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from horizon.browsers import views
|
from horizon.browsers import views
|
||||||
from magnum_ui.content.cluster_templates import panel
|
from magnum_ui.content.cluster_templates import panel
|
||||||
|
@ -21,7 +21,8 @@ from magnum_ui.content.cluster_templates import panel
|
||||||
title = _("Container Infra - Cluster Templates")
|
title = _("Container Infra - Cluster Templates")
|
||||||
page_title = panel.ClusterTemplates.name
|
page_title = panel.ClusterTemplates.name
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^$',
|
re_path(r'^$',
|
||||||
views.AngularIndexView.as_view(title=title, page_title=page_title),
|
views.AngularIndexView.as_view(title=title,
|
||||||
name='index'),
|
page_title=page_title),
|
||||||
|
name='index'),
|
||||||
]
|
]
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from django.conf.urls import url
|
from django.urls import re_path
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from horizon.browsers import views
|
from horizon.browsers import views
|
||||||
from magnum_ui.content.clusters import panel
|
from magnum_ui.content.clusters import panel
|
||||||
|
@ -21,7 +21,7 @@ from magnum_ui.content.clusters import panel
|
||||||
title = _("Container Infra - Clusters")
|
title = _("Container Infra - Clusters")
|
||||||
page_title = panel.Clusters.name
|
page_title = panel.Clusters.name
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^$',
|
re_path(r'^$', views.AngularIndexView.as_view(
|
||||||
views.AngularIndexView.as_view(title=title, page_title=page_title),
|
title=title, page_title=page_title),
|
||||||
name='index'),
|
name='index'),
|
||||||
]
|
]
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from django.conf.urls import url
|
from django.urls import re_path
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from horizon.browsers import views
|
from horizon.browsers import views
|
||||||
|
@ -20,7 +20,7 @@ from magnum_ui.content.container_infra.quotas import panel
|
||||||
title = _("Container Infra - Quotas")
|
title = _("Container Infra - Quotas")
|
||||||
page_title = panel.Quotas.name
|
page_title = panel.Quotas.name
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
url(r'^$',
|
re_path(r'^$', views.AngularIndexView.as_view(
|
||||||
views.AngularIndexView.as_view(title=title, page_title=page_title),
|
title=title, page_title=page_title),
|
||||||
name='index'),
|
name='index'),
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in New Issue