openstack/zaqar-ui
Code Issues Proposed changes

Re-enabling checkout and small fixes

Browse Source 
1. Re-enabled the check-only flag for make messages. This previously did
not work because we did not have a locale file in master to revert back to.

2. Removed reduntant settings in the enabled file. The auto discovery will
take care of importing the JS files correctly.

3. Added to the documentation to include latest enabled file.

Change-Id: I8e878b60bd5951b4741171136a5e082c4007e0de
This commit is contained in:
Thai Tran 2016-01-14 13:16:29 -08:00
parent a11cbc78b1
commit e779265f18
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/source/index.rst
View File

@ -41,7 +41,8 @@ Install Zaqar UI with all dependencies in your virtual environment::
And enable it in Horizon:: And enable it in Horizon::
cp ../zaqar-ui/enabled/_80_add_messaging_dashboard.py openstack_dashboard/local/enabled cp ../zaqar-ui/enabled/_1510_messaging_panel_group.py openstack_dashboard/local/enabled
cp ../zaqar-ui/enabled/_1520_zaqar_project_queues.py openstack_dashboard/local/enabled
Release Notes Release Notes
============= =============

6
run_tests.sh
View File

@ -428,9 +428,9 @@ function run_makemessages {
babel_extract djangojs babel_extract djangojs
ZAQAR_JS_RESULT=$? ZAQAR_JS_RESULT=$?
#if [ $check_only -eq 1 ]; then if [ $check_only -eq 1 ]; then
#git checkout -- zaqar_ui/locale/django*.pot git checkout -- zaqar_ui/locale/django*.pot
#fi fi
exit $(($ZAQAR_PY_RESULT || $ZAQAR_JS_RESULT)) exit $(($ZAQAR_PY_RESULT || $ZAQAR_JS_RESULT))
} }

8
zaqar_ui/enabled/_1520_project_queues.py
View File

@ -25,14 +25,6 @@ ADD_ANGULAR_MODULES = [
'horizon.dashboard.project.queues' 'horizon.dashboard.project.queues'
] ]
ADD_JS_FILES = [
'dashboard/project/queues/queues.module.js',
]
ADD_JS_SPEC_FILES = [
'dashboard/project/queues/queues.module.spec.js',
]
ADD_SCSS_FILES = [ ADD_SCSS_FILES = [
'dashboard/project/queues/queues.scss' 'dashboard/project/queues/queues.scss'
] ]