Merge "Move Developer enabled/ files to contrib" into stable/newton
This commit is contained in:
commit
03e8d3d032
|
@ -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)
|
||||
|
|
|
@ -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
|
|
@ -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,
|
||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue