Merge pull request #480 from WebTools-NG/#456-ET-Custom-levels-doesn't-use-include-params

#456 Fixed
This commit is contained in:
Tommy Mikkelsen 2022-05-09 13:38:04 +02:00 committed by GitHub
commit e8c6a3e253
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions

View file

@ -18,6 +18,7 @@
* [#459 Viewstate copy](https://github.com/WebTools-NG/WebTools-NG/issues/459)
* [#476 Refactor status dialog](https://github.com/WebTools-NG/WebTools-NG/issues/476)
* [#460 Custom Export Tools incorrectly parses part file and part file path](https://github.com/WebTools-NG/WebTools-NG/issues/460)
* [#456 ET Custom levels doesn't use include params](https://github.com/WebTools-NG/WebTools-NG/issues/456)
## V0.3.15 (20220413)

View file

@ -1566,15 +1566,18 @@ const etHelper = new class ETHELPER {
}
if (includeInfo == 'undefined')
{
includeInfo = ''
// Check if we have a custom level
includeInfo = wtconfig.get(`ET.CustomLevels.${this.Settings.libTypeSec}.Include.${this.Settings.levelName}`, '');
}
if (includeInfo == undefined)
{
includeInfo = ''
// Check if we have a custom level
includeInfo = wtconfig.get(`ET.CustomLevels.${this.Settings.libTypeSec}.Include.${this.Settings.levelName}`, '');
}
if (includeInfo == null)
{
includeInfo = wtconfig.get('ET.CustomLevels.' + this.Settings.libTypeSec + '.Include.' + this.Settings.levelName);
// Check if we have a custom level
includeInfo = wtconfig.get(`ET.CustomLevels.${this.Settings.libTypeSec}.Include.${this.Settings.levelName}`, '');
}
log.debug(`[ethelper.js] (getIncludeInfo) - returning: ${includeInfo}`);
return includeInfo;