Merge "Fix Angular errors in openstack_auth" into stable/pike

5 files changed, 21 insertions, 13 deletions

diff --git a/horizon/base.py b/horizon/base.py
index 903894ef2..e2c2a830a 100644
--- a/horizon/base.py
+++ b/horizon/base.py
@@ -869,13 +869,6 @@ class Site(Registry, HorizonComponent):
             urlpatterns.append(url(r'^%s/' % dash.slug,
                                    include(dash._decorated_urls)))
 
-        # add URL for ngdetails
-        views = import_module('horizon.browsers.views')
-        urlpatterns.append(url(r'^ngdetails/',
-                               views.AngularDetailsView.as_view(),
-                               name='ngdetails'))
-        _decorate_urlconf(urlpatterns, require_auth)
-
         # Return the three arguments to django.conf.urls.include
         return urlpatterns, self.namespace, self.slug
 
diff --git a/horizon/test/tests/base.py b/horizon/test/tests/base.py
index 72efe1cf2..43aea570d 100644
--- a/horizon/test/tests/base.py
+++ b/horizon/test/tests/base.py
@@ -328,12 +328,6 @@ class HorizonTests(BaseHorizonTests):
         # Restore settings
         settings.SECURE_PROXY_SSL_HEADER = None
 
-    def test_urls_ngdetails(self):
-        resp = self.client.get("/ngdetails/")
-        self.assertEqual(200, resp.status_code)
-        resp = self.client.get("/ngdetails/OS::Glance::Image/xxxxx-xxx")
-        self.assertEqual(200, resp.status_code)
-
 
 class GetUserHomeTests(BaseHorizonTests):
     """Test get_user_home parameters."""
diff --git a/openstack_dashboard/test/urls.py b/openstack_dashboard/test/urls.py
index cc3a73d15..1dfaa358c 100644
--- a/openstack_dashboard/test/urls.py
+++ b/openstack_dashboard/test/urls.py
@@ -24,6 +24,8 @@ from django.conf.urls import url
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.views import defaults
 
+from horizon.browsers import views as browsers_views
+
 from openstack_dashboard.api import rest
 from openstack_dashboard.test.jasmine import jasmine
 from openstack_dashboard import views
@@ -36,6 +38,9 @@ urlpatterns = [
     url(r'^api/', include(rest.urls)),
     url(r'^jasmine/(.*?)$', jasmine.dispatcher),
     url(r'', include(horizon.urls)),
+    url(r'^ngdetails/',
+        browsers_views.AngularDetailsView.as_view(),
+        name='ngdetails'),
 ]
 
 # Development static app and project media serving using the staticfiles app.
diff --git a/openstack_dashboard/test/views.py b/openstack_dashboard/test/views.py
index 66a1a6a50..ea23e4a6b 100644
--- a/openstack_dashboard/test/views.py
+++ b/openstack_dashboard/test/views.py
@@ -44,3 +44,9 @@ class DashboardViewsTest(test.TestCase):
         url = views.get_url_with_pagination(
             req, None, 'prev', url_string, None)
         self.assertEqual(six.text_type('/project/instances/?prev=id'), url)
+
+    def test_urls_ngdetails(self):
+        resp = self.client.get("/ngdetails/")
+        self.assertEqual(200, resp.status_code)
+        resp = self.client.get("/ngdetails/OS::Glance::Image/xxxxx-xxx")
+        self.assertEqual(200, resp.status_code)
diff --git a/openstack_dashboard/urls.py b/openstack_dashboard/urls.py
index 199223925..f77741237 100644
--- a/openstack_dashboard/urls.py
+++ b/openstack_dashboard/urls.py
@@ -28,6 +28,9 @@ from django.contrib.staticfiles.urls import staticfiles_urlpatterns
 from django.views import defaults
 
 import horizon
+import horizon.base
+from horizon.browsers import views as browsers_views
+from horizon.decorators import require_auth
 
 from openstack_dashboard.api import rest
 from openstack_dashboard import views
@@ -38,6 +41,13 @@ urlpatterns = [
     url(r'', include(horizon.urls)),
 ]
 
+# add URL for ngdetails
+ngdetails_url = url(r'^ngdetails/',
+                    browsers_views.AngularDetailsView.as_view(),
+                    name='ngdetails')
+urlpatterns.append(ngdetails_url)
+horizon.base._decorate_urlconf([ngdetails_url], require_auth)
+
 for u in getattr(settings, 'AUTHENTICATION_URLS', ['openstack_auth.urls']):
     urlpatterns.append(url(r'^auth/', include(u)))