refs #4974 Minor changes
This commit is contained in:
parent
cc12ff328f
commit
e10b8f10ba
19
src/main.js
19
src/main.js
|
@ -103,7 +103,8 @@ var App = {
|
|||
// Delete old strings values (REMOVE IN VERSION 5)
|
||||
this.regDelete(Conf.regPath + 'configured');
|
||||
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');
|
||||
|
@ -144,7 +145,14 @@ var App = {
|
|||
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) {
|
||||
this.$('notSignOut').checked = true;
|
||||
|
@ -172,7 +180,7 @@ var App = {
|
|||
var driverPath = this.getEnv('ProgramFiles') + Conf.driverPath;
|
||||
var params = {
|
||||
Driver: driverPath,
|
||||
DESCRIPTION: Conf.appName,
|
||||
DESCRIPTION: Conf.defaultDatasource,
|
||||
SERVER: Conf.defaultServer,
|
||||
DATABASE: Conf.dbName,
|
||||
SSLCA: this.certFile,
|
||||
|
@ -180,7 +188,6 @@ var App = {
|
|||
SSLCIPHER: 'AES256-SHA',
|
||||
AUTO_RECONNECT: 1,
|
||||
NO_PROMPT: 1,
|
||||
ENABLE_CLEARTEXT_PLUGIN: 1
|
||||
};
|
||||
|
||||
this.regWrite(path + 'ODBC Data Sources', dsName, driverName);
|
||||
|
@ -276,7 +283,9 @@ var App = {
|
|||
this.$('user').value = myUID;
|
||||
this.$('password').value = myPWD;
|
||||
} else {
|
||||
this.$('user').value = this.regRead(odbcPath, 'UID')
|
||||
var user = this.regRead(odbcPath, 'UID')
|
||||
if (user)
|
||||
this.$('user').value = user
|
||||
if (!notSignOut)
|
||||
this.resetForm(true)
|
||||
else
|
||||
|
|
|
@ -99,6 +99,9 @@ button:hover {
|
|||
background-color: #3d3f42;
|
||||
cursor: pointer;
|
||||
}
|
||||
select {
|
||||
color: white;
|
||||
}
|
||||
|
||||
/* Branch */
|
||||
|
||||
|
|
Loading…
Reference in New Issue