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

refs #4974 Minor changes

This commit is contained in:
Guillermo Bonet 2023-01-26 10:49:44 +01:00
parent cc12ff328f
commit e10b8f10ba
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.js
View File

@ -103,7 +103,8 @@ var App = {
// Delete old strings values (REMOVE IN VERSION 5) // Delete old strings values (REMOVE IN VERSION 5)
this.regDelete(Conf.regPath + 'configured'); this.regDelete(Conf.regPath + 'configured');
this.regDelete(Conf.regPath + 'remember'); this.regDelete(Conf.regPath + 'remember');
// this.regDelete(Conf.odbcPath + 'verdnatura'); ToDo: Descomentar al subir this.regDelete(Conf.odbcPath + 'verdnatura');
this.regDelete(Conf.odbcPath + 'ODBC Data Sources\\verdnatura');
} }
var notSignOut = this.regRead(Conf.regPath, 'notSignOut'); var notSignOut = this.regRead(Conf.regPath, 'notSignOut');
@ -144,7 +145,14 @@ var App = {
selectDatarouce.options.add(option[y]) selectDatarouce.options.add(option[y])
} }
} }
this.$('datasource').value = this.dsName;
// In case old general odbc (REMOVE IN VERSION 5)
if (this.dsName == 'verdnatura') {
this.dsName = Conf.defaultDatasource;
this.$('datasource').value = this.dsName + Conf.identifier;
this.$('datasource').text = this.dsName;
} else
this.$('datasource').value = this.dsName;
if (notSignOut && password) { if (notSignOut && password) {
this.$('notSignOut').checked = true; this.$('notSignOut').checked = true;
@ -172,7 +180,7 @@ var App = {
var driverPath = this.getEnv('ProgramFiles') + Conf.driverPath; var driverPath = this.getEnv('ProgramFiles') + Conf.driverPath;
var params = { var params = {
Driver: driverPath, Driver: driverPath,
DESCRIPTION: Conf.appName, DESCRIPTION: Conf.defaultDatasource,
SERVER: Conf.defaultServer, SERVER: Conf.defaultServer,
DATABASE: Conf.dbName, DATABASE: Conf.dbName,
SSLCA: this.certFile, SSLCA: this.certFile,
@ -180,7 +188,6 @@ var App = {
SSLCIPHER: 'AES256-SHA', SSLCIPHER: 'AES256-SHA',
AUTO_RECONNECT: 1, AUTO_RECONNECT: 1,
NO_PROMPT: 1, NO_PROMPT: 1,
ENABLE_CLEARTEXT_PLUGIN: 1
}; };
this.regWrite(path + 'ODBC Data Sources', dsName, driverName); this.regWrite(path + 'ODBC Data Sources', dsName, driverName);
@ -276,7 +283,9 @@ var App = {
this.$('user').value = myUID; this.$('user').value = myUID;
this.$('password').value = myPWD; this.$('password').value = myPWD;
} else { } else {
this.$('user').value = this.regRead(odbcPath, 'UID') var user = this.regRead(odbcPath, 'UID')
if (user)
this.$('user').value = user
if (!notSignOut) if (!notSignOut)
this.resetForm(true) this.resetForm(true)
else else

3
src/style.css
View File

@ -99,6 +99,9 @@ button:hover {
background-color: #3d3f42; background-color: #3d3f42;
cursor: pointer; cursor: pointer;
} }
select {
color: white;
}
/* Branch */ /* Branch */