getredash#121: 'show query' button for non-owners

hailocab · Mar 11, 2014 · 02cf984 · 02cf984
1 parent ef86f44
commit 02cf984
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/rd_ui/app/scripts/controllers/query_view.js b/rd_ui/app/scripts/controllers/query_view.js
@@ -6,6 +6,7 @@
     var pristineHash = null;
     var leavingPageText = "You will lose your changes if you leave";
 
+    $scope.showQuery = false;
     $scope.isEditing = false;
     $scope.dirty = undefined;
     $scope.newVisualization = undefined;
@@ -52,7 +53,11 @@
     });
 
     $scope.toggleEdit = function (state) {
-      $scope.isEditing = (state !== undefined) ? state : !$scope.isEditing;
+      $scope.isEditing = $scope.showQuery =
+        (state !== undefined) ? state : !$scope.isEditing;
+    };
+    $scope.toggleShowQuery = function() {
+      $scope.showQuery = !$scope.showQuery;
     };
 
     $scope.lockButton = function(lock) {
@@ -98,7 +103,7 @@
             $location.path($location.path().replace(oldId, q.id)).replace();
 
             // Reset visualizations tab to table after duplicating a query:
-            $location.hash('table');
+            $location.hash(DEFAULT_TAB);
           }
         }
       }, function(httpResponse) {

diff --git a/rd_ui/app/views/queryview.html b/rd_ui/app/views/queryview.html
@@ -8,6 +8,7 @@ <h1>
                     <button class="btn btn-success" ng-show="isEditing" ng-click="saveQuery() && toggleEdit(false)">
                         <span class="glyphicon glyphicon-floppy-disk"> </span> Save<span ng-show="dirty">&#42;</span>
                     </button>
+                    <button class="btn btn-default" ng-show="!currentUser.canEdit(query)" ng-click="toggleShowQuery()">View Query</button>
                     <button class="btn btn-default" ng-show="currentUser.canEdit(query)" ng-click="toggleEdit()">
                         <span class="glyphicon glyphicon-edit"></span>
                         <span ng-show="isEditing"> Done</span>
@@ -16,8 +17,8 @@ <h1>
                     <button type="button" class="btn btn-default" ng-click="duplicateQuery()">
                         <span class="glyphicon glyphicon-share-alt"></span> Duplicate
                     </button>
-                    <button class="btn btn-primary" ng-disabled="queryExecuting || !queryResult.getData()" ng-href="{{dataUri}}" download="{{dataFilename}}" target="_self"><span class="glyphicon glyphicon-cloud-download"></span> Download
-                    </button>
+                    <a class="btn btn-primary" ng-disabled="queryExecuting || !queryResult.getData()" ng-href="{{dataUri}}" download="{{dataFilename}}" target="_self"><span class="glyphicon glyphicon-cloud-download"></span> Download
+                    </a>
                 </span>
             </h1>
         </div>
@@ -27,6 +28,11 @@ <h1>
 
     <div class="row">
         <div ng-class="{'col-lg-6': isEditing, 'col-lg-3': !isEditing}">
+            <div ng-show="!isEditing && query.description">
+                <em>{{ query.description }}</em>
+                <hr>
+            </div>
+
             <div ng-show="isEditing">
                 <p>
                     <button type="button" class="btn btn-primary btn-xs" ng-disabled="queryExecuting" ng-click="executeQuery()">
@@ -48,17 +54,13 @@ <h1>
                     </div>
                     <div class="alert alert-danger" ng-show="queryResult.getError()">Error running query: <strong>{{queryResult.getError()}}</strong></div>
                 </p>
-
-                <p>
-                    <textarea ui-codemirror="editorOptions" ui-refresh="isEditing" ng-model="query.query"></textarea>
-                    <!-- CodeMirror renders here -->
-                </p>
             </div>
 
-            <div ng-show="query.description">
-                <em>{{ query.description }}</em>
-                <hr>
-            </div>
+            <p ng-show="showQuery">
+                <textarea ui-codemirror="editorOptions" ui-refresh="showQuery" ng-model="query.query"></textarea>
+                <!-- CodeMirror renders here -->
+            </p>
+
             <p>
                 <span class="glyphicon glyphicon-refresh"></span>
                 <span class="text-muted">Last update </span>
@@ -89,7 +91,7 @@ <h1>
                         <rd-tab id="{{vis.id}}" name="{{vis.name}}" ng-hide="vis.type=='TABLE'" ng-repeat="vis in query.visualizations">
                             <span class="remove" ng-click="deleteVisualization($event, vis)" ng-show="currentUser.canEdit(query)"> &times;</span>
                         </rd-tab>
-                        <rd-tab id="add" name="&plus; New" removeable="true" ng-show="currentUser.canEdit(query)"></rd-tab>
+                        <rd-tab id="add" name="&plus; New" removeable="true" ng-show="currentUser.canEdit(query) && isEditing"></rd-tab>
                     </ul>
                 </div>
             </div>
@@ -100,12 +102,12 @@ <h1>
 
                     <div ng-show="selectedTab == vis.id" ng-repeat="vis in query.visualizations">
                         <visualization-renderer visualization="vis" query-result="queryResult"></visualization-renderer>
-                        <edit-visulatization-form visualization="vis" query="query" query-result="queryResult"></edit-visulatization-form>
+                        <edit-visulatization-form visualization="vis" query="query" query-result="queryResult" ng-show="isEditing"></edit-visulatization-form>
                     </div>
 
                     <div ng-show="selectedTab == 'add'">
                         <visualization-renderer visualization="newVisualization" query-result="queryResult"></visualization-renderer>
-                        <edit-visulatization-form visualization="newVisualization" query="query"></edit-visulatization-form>
+                        <edit-visulatization-form visualization="newVisualization" query="query" ng-show="isEditing"></edit-visulatization-form>
                     </div>
                 </div>
             </div>