Merge pull request #468 from EverythingMe/fix/visualization_api

Fix: visualizations API fixes
getredash · Jul 2, 2015 · 2dab35b · 2dab35b
2 parents e6650e1 + 0b61b88
commit 2dab35b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/rd_ui/app/scripts/visualizations/base.js b/rd_ui/app/scripts/visualizations/base.js
@@ -121,7 +121,7 @@
         query: '=',
         queryResult: '=',
         visualization: '=?',
-        openEditor: '=?',
+        openEditor: '@',
         onNewSuccess: '=?'
       },
       link: function (scope, element, attrs) {
@@ -150,9 +150,10 @@
         scope.$watch('visualization.type', function (type, oldType) {
           // if not edited by user, set name to match type
           if (type && oldType != type && scope.visualization && !scope.visForm.name.$dirty) {
-            // poor man's titlecase
-            scope.visualization.name = scope.visualization.type[0] + scope.visualization.type.slice(1).toLowerCase();
+            scope.visualization.name = _.string.titleize(scope.visualization.type);
           }
+
+          scope.visualization.options = Visualization.visualizations[scope.visualization.type].defaultOptions;
         });
 
         scope.submit = function () {

diff --git a/rd_ui/app/scripts/visualizations/map.js b/rd_ui/app/scripts/visualizations/map.js
@@ -10,7 +10,10 @@
       '</map-renderer>';
 
     var editTemplate = '<map-editor></map-editor>';
-    var defaultOptions = { 'height': 500 };
+    var defaultOptions = {
+      'height': 500,
+      'draw': 'Marker'
+    };
 
     VisualizationProvider.registerVisualization({
       type: 'MAP',
@@ -227,9 +230,6 @@
       link: function($scope, elm, attrs) {
         $scope.visualization.options.draw_options = ['Marker','Color'];
         $scope.visualization.options.classify_columns = $scope.queryResult.columnNames.concat('none');
-
-        //FIXME: The following line should be removed when defaultOptions work
-        $scope.visualization.options.height = $scope.visualization.options.height || 500;
       }
     }
   });

diff --git a/rd_ui/app/views/visualizations/edit_visualization.html b/rd_ui/app/views/visualizations/edit_visualization.html
@@ -1,7 +1,7 @@
 <div>
   <span ng-click="openEditor=!openEditor" class="details-toggle" ng-class="{open: openEditor}">Edit</span>
 
-  <form ng-if="openEditor" role="form" name="visForm" ng-submit="submit()">
+  <form ng-show="openEditor" role="form" name="visForm" ng-submit="submit()">
     <div class="form-group">
       <label class="control-label">Name</label>
       <input name="name" type="text" class="form-control" ng-model="visualization.name" placeholder="{{visualization.type | capitalize}}">

diff --git a/redash/controllers.py b/redash/controllers.py
@@ -12,7 +12,7 @@
 import logging
 
 from flask import render_template, send_from_directory, make_response, request, jsonify, redirect, \
-    session, url_for
+    session, url_for, current_app
 from flask.ext.restful import Resource, abort
 from flask_login import current_user, login_user, logout_user
 import sqlparse
@@ -547,7 +547,12 @@ def delete(self, job_id):
 
 @app.route('/<path:filename>')
 def send_static(filename):
-    return send_from_directory(settings.STATIC_ASSETS_PATH, filename)
+    if current_app.debug:
+        cache_timeout = 0
+    else:
+        cache_timeout = None
+
+    return send_from_directory(settings.STATIC_ASSETS_PATH, filename, cache_timeout=cache_timeout)
 
 
 if __name__ == '__main__':