Merge pull request #373 from EverythingMe/feature/variables

UI Fixes
getredash · Feb 8, 2015 · 89e307d · 89e307d
2 parents d82d5c3 + a5eb0e2
commit 89e307d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/rd_ui/app/scripts/controllers/query_view.js b/rd_ui/app/scripts/controllers/query_view.js
@@ -155,6 +155,8 @@
         $scope.query.queryResult = $scope.queryResult;
 
         notifications.showNotification("re:dash", $scope.query.name + " updated.");
+      } else if (status == 'failed') {
+        notifications.showNotification("re:dash", $scope.query.name + " failed to run: " + $scope.queryResult.getError());
       }
 
       if (status === 'done' || status === 'failed') {

diff --git a/rd_ui/app/scripts/directives/query_directives.js b/rd_ui/app/scripts/directives/query_directives.js
@@ -98,13 +98,13 @@
                 </button>',
       link: function($scope) {
         $scope.formatQuery = function formatQuery() {
-            $scope.queryExecuting = true;
+            $scope.queryFormatting = true;
             $http.post('/api/queries/format', {
                 'query': $scope.query.query
             }).success(function (response) {
                 $scope.query.query = response;
             }).finally(function () {
-              $scope.queryExecuting = false;
+              $scope.queryFormatting = false;
             });
         };
       }

diff --git a/rd_ui/app/views/query.html b/rd_ui/app/views/query.html
@@ -82,7 +82,7 @@ <h2>
             <!-- code editor -->
             <div ng-show="sourceMode">
                 <p>
-                    <query-editor query="query" lock="queryExecuting"></query-editor>
+                    <query-editor query="query" lock="queryFormatting"></query-editor>
                 </p>
                 <hr>
             </div>