Merge pull request #651 from alonho/datasource_defaults

Support default values in data source creation forms
getredash · Nov 15, 2015 · 346ea66 · 346ea66
2 parents d14b74b + a87179b
commit 346ea66
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/rd_ui/app/views/data_sources/form.html b/rd_ui/app/views/data_sources/form.html
@@ -10,7 +10,7 @@
     <div class="form-group" ng-class='{"has-error": !inner.input.$valid}' ng-form="inner" ng-repeat="(name, input) in type.configuration_schema.properties">
         <label>{{input.title || name | capitalize}}</label>
         <input name="input" type="{{input.type}}" class="form-control" ng-model="dataSource.options[name]" ng-required="input.required"
-                ng-if="input.type !== 'file'" accesskey="tab">
+                ng-if="input.type !== 'file'" accesskey="tab" placeholder="{{input.default}}">
 
         <input name="input" type="file" class="form-control" ng-model="files[name]" ng-required="input.required && !dataSource.options[name]"
                base-sixty-four-input

diff --git a/redash/query_runner/mysql.py b/redash/query_runner/mysql.py
@@ -33,7 +33,8 @@ def configuration_schema(cls):
             'type': 'object',
             'properties': {
                 'host': {
-                    'type': 'string'
+                    'type': 'string',
+                    'default': '127.0.0.1'
                 },
                 'user': {
                     'type': 'string'
@@ -47,7 +48,8 @@ def configuration_schema(cls):
                     'title': 'Database name'
                 },
                 'port': {
-                    'type': 'number'
+                    'type': 'number',
+                    'default': 3306,
                 },
                 'use_ssl': {
                     'type': 'boolean',

diff --git a/redash/query_runner/pg.py b/redash/query_runner/pg.py
@@ -57,10 +57,12 @@ def configuration_schema(cls):
                     "type": "string"
                 },
                 "host": {
-                    "type": "string"
+                    "type": "string",
+                    "default": "127.0.0.1"
                 },
                 "port": {
-                    "type": "number"
+                    "type": "number",
+                    "default": 5432
                 },
                 "dbname": {
                     "type": "string",