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

refs #4974 Config default branches and datasources

This commit is contained in:
Guillermo Bonet 2023-02-09 19:00:43 +01:00
parent c863737092
commit d7984bd915
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.js
View File

@ -79,7 +79,8 @@ var App = {
'SELECT dsName FROM TblConfig', 'SELECT dsName FROM TblConfig',
'dsName', String 'dsName', String
); );
this.dsName = mdbDsName || Conf.defaultDatasource; var userDefaultDatasource = this.regRead(Conf.regPath, 'defaultDatasource');
this.dsName = mdbDsName || userDefaultDatasource || Conf.defaultDatasource;
// Creates the necessary registry entries // Creates the necessary registry entries
var lastVersion = this.regRead(Conf.regPath, 'lastExecutedVersion'); var lastVersion = this.regRead(Conf.regPath, 'lastExecutedVersion');
@ -145,9 +146,12 @@ var App = {
var branch = this.mdbGetValue( var branch = this.mdbGetValue(
'SELECT branch FROM tblVariables', 'SELECT branch FROM tblVariables',
'branch', String 'branch', String
); );
if (!branch)
branch = Conf.defaultBranch; if (!branch) {
userDefaultBranch = this.regRead(Conf.regPath, 'defaultBranch');
branch = userDefaultBranch || Conf.defaultBranch;
}
this.$('branch').value = branch; this.$('branch').value = branch;
this.onChangeBranch(); this.onChangeBranch();