verdnatura/vn-access
verdnatura
/
vn-access
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat: refs #5308 Upgrade to v7 #6

Merged
guillermo merged 5 commits from 5308-hideDeveloperOptions into master 2024-02-23 12:31:39 +00:00
Conversation 1 Commits 5 Files Changed 29 +4 -5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 13489bc713 - Show all commits

9
src/main.js
View File

@ -179,7 +179,7 @@ var App = {
} }
this.$('datasource').value = this.dsName; this.$('datasource').value = this.dsName;
if (this.regRead(Conf.regPath, 'autoDeployDevOptions') && this.hasDeveloperMode) if (this.regRead(Conf.regPath, 'autoDisplayDevOptions') && this.hasDeveloperMode)
App.openOptions() App.openOptions()
this.refreshDeveloperMode(); this.refreshDeveloperMode();
@ -211,17 +211,16 @@ var App = {
this.$('password').select(); this.$('password').select();
}, },
createODBC: function(path, dsName, driverName, description) { createODBC: function(path, dsName, driverName, description) {
var driverPath = this.getEnv('ProgramFiles') + Conf.driverPath;
var params = { var params = {
Driver: driverPath, Driver: this.getEnv('ProgramFiles') + Conf.driverPath,
DESCRIPTION: description, DESCRIPTION: description,
SERVER: Conf.defaultServer, SERVER: Conf.defaultServer,
DATABASE: Conf.dbName, DATABASE: Conf.dbName,
SSLCA: this.certFile, SSLCA: this.certFile,
SSLMODE: 'VERIFY_IDENTITY', SSLMODE: 'REQUIRED',
SSLCIPHER: 'AES256-SHA',
AUTO_RECONNECT: 1, AUTO_RECONNECT: 1,
NO_PROMPT: 1, NO_PROMPT: 1,
NO_BIGINT: 1
}; };
this.regWrite(path + 'ODBC Data Sources', dsName, driverName); this.regWrite(path + 'ODBC Data Sources', dsName, driverName);