Mirrors/WebTools-NG
2
0
Fork 0
mirror of https://github.com/WebTools-NG/WebTools-NG synced 2024-11-26 21:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
#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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -18,6 +18,7 @@
* [#459 Viewstate copy](https://github.com/WebTools-NG/WebTools-NG/issues/459) * [#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) * [#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) * [#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) ## V0.3.15 (20220413)

9
src/components/modules/ExportTools/scripts/ethelper.js
View file

@ -1566,15 +1566,18 @@ const etHelper = new class ETHELPER {
} }
if (includeInfo == 'undefined') 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) 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) 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}`); log.debug(`[ethelper.js] (getIncludeInfo) - returning: ${includeInfo}`);
return includeInfo; return includeInfo;