Compare commits

..

4 Commits

Author SHA1 Message Date
Arik Fraimovich
c32c2d43f7 Bump version. 2015-07-04 10:41:06 +03:00
Arik Fraimovich
4e2e3f9077 Merge pull request #472 from BrunoSalerno/map_visualization_options_fixed
map visualization: options fixed
2015-07-04 10:23:55 +03:00
Bruno Salerno
2a27422df9 map visualization: draw_options to scope 2015-07-03 18:02:22 -03:00
Bruno Salerno
f9e0ce8e9c map visualization: options fixed 2015-07-03 16:45:55 -03:00
3 changed files with 7 additions and 6 deletions

View File

@@ -12,7 +12,8 @@
var editTemplate = '<map-editor></map-editor>';
var defaultOptions = {
'height': 500,
'draw': 'Marker'
'draw': 'Marker',
'classify':'none'
};
VisualizationProvider.registerVisualization({
@@ -228,8 +229,8 @@
restrict: 'E',
templateUrl: '/views/visualizations/map_editor.html',
link: function($scope, elm, attrs) {
$scope.visualization.options.draw_options = ['Marker','Color'];
$scope.visualization.options.classify_columns = $scope.queryResult.columnNames.concat('none');
$scope.draw_options = ['Marker','Color'];
$scope.classify_columns = $scope.queryResult.columnNames.concat('none');
}
}
});

View File

@@ -9,7 +9,7 @@
<div class="form-group">
<label class="col-lg-2">Draw option</label>
<div class="col-sm-4">
<select ng-options="opt for opt in visualization.options.draw_options" ng-model="visualization.options.draw" class="form-control"></select>
<select ng-options="opt for opt in draw_options" ng-model="visualization.options.draw" class="form-control"></select>
</div>
</div>
<div class="form-group">
@@ -29,7 +29,7 @@
<div class="form-group">
<label class="col-lg-2">Classify by column</label>
<div class="col-sm-4">
<select ng-options="name for name in visualization.options.classify_columns" ng-model="visualization.options.classify" class="form-control"></select>
<select ng-options="name for name in classify_columns" ng-model="visualization.options.classify" class="form-control"></select>
</div>
</div>

View File

@@ -6,7 +6,7 @@ from statsd import StatsClient
from redash import settings
from redash.query_runner import import_query_runners
__version__ = '0.6.1'
__version__ = '0.6.2'
def setup_logging():