IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix new setting default value handling.

Browse Source
This commit is contained in:
Ramiro Morales 2018-10-15 21:40:40 -03:00
parent d859a6aeb8
commit 90de703ef2
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/plugins/datasource/mssql/config_ctrl.ts Normal file
View File

@ -0,0 +1,10 @@
export class MssqlConfigCtrl {
static templateUrl = 'partials/config.html';
current: any;
/** @ngInject */
constructor($scope) {
this.current.jsonData.encrypt = this.current.jsonData.encrypt || 'false';
}
}

5
public/app/plugins/datasource/mssql/module.ts
View File

@ -1,9 +1,6 @@
import { MssqlDatasource } from './datasource'; import { MssqlDatasource } from './datasource';
import { MssqlQueryCtrl } from './query_ctrl'; import { MssqlQueryCtrl } from './query_ctrl';
import { MssqlConfigCtrl } from './config_ctrl';
class MssqlConfigCtrl {
static templateUrl = 'partials/config.html';
}
const defaultQuery = `SELECT const defaultQuery = `SELECT
<time_column> as time, <time_column> as time,

2
public/app/plugins/datasource/mssql/partials/config.html
View File

@ -31,7 +31,7 @@
<div class="gf-form"> <div class="gf-form">
<label class="gf-form-label width-7">Encrypt</label> <label class="gf-form-label width-7">Encrypt</label>
<div class="gf-form-select-wrapper max-width-15 gf-form-select-wrapper--has-help-icon"> <div class="gf-form-select-wrapper max-width-15 gf-form-select-wrapper--has-help-icon">
<select class="gf-form-input" ng-model="ctrl.current.jsondata.encrypt" ng-options="mode for mode in ['disable', 'false', 'true']" ng-init="ctrl.current.jsondata.encrypt"></select> <select class="gf-form-input" ng-model="ctrl.current.jsonData.encrypt" ng-options="mode for mode in ['disable', 'false', 'true']" ng-init="ctrl.current.jsonData.encrypt"></select>
<info-popover mode="right-absolute"> <info-popover mode="right-absolute">
Determines whether or to which extent a secure SSL TCP/IP connection will be negotiated with the server. Determines whether or to which extent a secure SSL TCP/IP connection will be negotiated with the server.
<ul> <ul>