From e779265f18479a0bcb8d6bc89250fafb97a65165 Mon Sep 17 00:00:00 2001
From: Thai Tran <tqtran@us.ibm.com>
Date: Thu, 14 Jan 2016 13:16:29 -0800
Subject: [PATCH] Re-enabling checkout and small fixes

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
---
 doc/source/index.rst                     | 3 ++-
 run_tests.sh                             | 6 +++---
 zaqar_ui/enabled/_1520_project_queues.py | 8 --------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/doc/source/index.rst b/doc/source/index.rst
index 121ee67..7599260 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -41,7 +41,8 @@ Install Zaqar UI with all dependencies in your virtual environment::
 
 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
 =============
diff --git a/run_tests.sh b/run_tests.sh
index 1d50730..212f565 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -428,9 +428,9 @@ function run_makemessages {
   babel_extract djangojs
   ZAQAR_JS_RESULT=$?
 
-  #if [ $check_only -eq 1 ]; then
-    #git checkout -- zaqar_ui/locale/django*.pot
-  #fi
+  if [ $check_only -eq 1 ]; then
+    git checkout -- zaqar_ui/locale/django*.pot
+  fi
 
   exit $(($ZAQAR_PY_RESULT || $ZAQAR_JS_RESULT))
 }
diff --git a/zaqar_ui/enabled/_1520_project_queues.py b/zaqar_ui/enabled/_1520_project_queues.py
index 6d761af..c7e8a34 100644
--- a/zaqar_ui/enabled/_1520_project_queues.py
+++ b/zaqar_ui/enabled/_1520_project_queues.py
@@ -25,14 +25,6 @@ ADD_ANGULAR_MODULES = [
     '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 = [
     'dashboard/project/queues/queues.scss'
 ]