From fbbe16f76d6d9437a9dcbd78e368f8f101f5a4fa Mon Sep 17 00:00:00 2001
From: Rob Cresswell <robert.cresswell@outlook.com>
Date: Fri, 19 Aug 2016 18:14:46 +0100
Subject: [PATCH] Move Developer enabled/ files to contrib

This patch moves the developer panel enabled files to contrib, to stop
any strange behaviour when interacting with settings from enabled files
and prevent warning logs when DEBUG is False.

Change-Id: If7a2d023afe418b6dd90edf8a4a1d3bc9646c7ad
---
 openstack_dashboard/contrib/developer/dashboard.py       | 4 +++-
 .../{ => contrib/developer}/enabled/_9001_developer.py   | 7 -------
 .../{ => contrib/developer}/enabled/_9010_preview.py     | 0
 .../developer}/enabled/_9020_resource_browser.py         | 0
 .../contrib/developer/enabled/__init__.py                | 0
 openstack_dashboard/test/settings.py                     | 4 +++-
 .../move-developer-enabled-files-b1ad2265cd79b11e.yaml   | 9 +++++++++
 7 files changed, 15 insertions(+), 9 deletions(-)
 rename openstack_dashboard/{ => contrib/developer}/enabled/_9001_developer.py (88%)
 rename openstack_dashboard/{ => contrib/developer}/enabled/_9010_preview.py (100%)
 rename openstack_dashboard/{ => contrib/developer}/enabled/_9020_resource_browser.py (100%)
 create mode 100644 openstack_dashboard/contrib/developer/enabled/__init__.py
 create mode 100644 releasenotes/notes/move-developer-enabled-files-b1ad2265cd79b11e.yaml

diff --git a/openstack_dashboard/contrib/developer/dashboard.py b/openstack_dashboard/contrib/developer/dashboard.py
index bf1219cbc4..828ebb4946 100644
--- a/openstack_dashboard/contrib/developer/dashboard.py
+++ b/openstack_dashboard/contrib/developer/dashboard.py
@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 
 import horizon
@@ -23,4 +24,5 @@ class Developer(horizon.Dashboard):
     default_panel = "theme_preview"
 
 
-horizon.register(Developer)
+if getattr(settings, 'DEBUG', False):
+    horizon.register(Developer)
diff --git a/openstack_dashboard/enabled/_9001_developer.py b/openstack_dashboard/contrib/developer/enabled/_9001_developer.py
similarity index 88%
rename from openstack_dashboard/enabled/_9001_developer.py
rename to openstack_dashboard/contrib/developer/enabled/_9001_developer.py
index 2484392bdb..b89d4a10f0 100644
--- a/openstack_dashboard/enabled/_9001_developer.py
+++ b/openstack_dashboard/contrib/developer/enabled/_9001_developer.py
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from django.conf import settings
-
 DASHBOARD = 'developer'
 
 ADD_ANGULAR_MODULES = [
@@ -29,8 +27,3 @@ ADD_SCSS_FILES = [
 ]
 
 AUTO_DISCOVER_STATIC_FILES = True
-
-DISABLED = True
-
-if getattr(settings, 'DEBUG', False):
-    DISABLED = False
diff --git a/openstack_dashboard/enabled/_9010_preview.py b/openstack_dashboard/contrib/developer/enabled/_9010_preview.py
similarity index 100%
rename from openstack_dashboard/enabled/_9010_preview.py
rename to openstack_dashboard/contrib/developer/enabled/_9010_preview.py
diff --git a/openstack_dashboard/enabled/_9020_resource_browser.py b/openstack_dashboard/contrib/developer/enabled/_9020_resource_browser.py
similarity index 100%
rename from openstack_dashboard/enabled/_9020_resource_browser.py
rename to openstack_dashboard/contrib/developer/enabled/_9020_resource_browser.py
diff --git a/openstack_dashboard/contrib/developer/enabled/__init__.py b/openstack_dashboard/contrib/developer/enabled/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/openstack_dashboard/test/settings.py b/openstack_dashboard/test/settings.py
index 4a84322629..42db0d8407 100644
--- a/openstack_dashboard/test/settings.py
+++ b/openstack_dashboard/test/settings.py
@@ -106,6 +106,7 @@ STATICFILES_DIRS = settings_utils.get_xstatic_dirs(
 )
 
 # Load the pluggable dashboard settings
+import openstack_dashboard.contrib.developer.enabled
 import openstack_dashboard.enabled
 import openstack_dashboard.local.enabled
 
@@ -113,7 +114,8 @@ INSTALLED_APPS = list(INSTALLED_APPS)  # Make sure it's mutable
 settings_utils.update_dashboards(
     [
         openstack_dashboard.enabled,
-        openstack_dashboard.local.enabled
+        openstack_dashboard.local.enabled,
+        openstack_dashboard.contrib.developer.enabled
     ],
     HORIZON_CONFIG,
     INSTALLED_APPS,
diff --git a/releasenotes/notes/move-developer-enabled-files-b1ad2265cd79b11e.yaml b/releasenotes/notes/move-developer-enabled-files-b1ad2265cd79b11e.yaml
new file mode 100644
index 0000000000..2df05a8fc0
--- /dev/null
+++ b/releasenotes/notes/move-developer-enabled-files-b1ad2265cd79b11e.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+  - The developer enabled files have been moved from
+    ``openstack_dashboard/enabled`` to
+    ``openstack_dashboard/contrib/developer/enabled``. To enable them, copy
+    into ``openstack_dashboard/local/enabled`` and set ``DEBUG = True``.
+fixes:
+  - There will no longer be any ``WARNING`` messages regarding
+    the developer panels in logs.