StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-20 00:05:04 +00:00
Code Releases Activity

Merge master

Browse source
This commit is contained in:
Dragory 2020-07-02 23:45:46 +03:00
commit 89e584a6f2
31 changed files with 1034 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/src/plugins/ZeppelinPluginClass.ts
View file

@ -118,6 +118,12 @@ export class ZeppelinPluginClass<TPluginType extends BasePluginType = BasePlugin
* the plugin, which is why this has to be a static function.
*/
protected static mergeAndDecodeStaticOptions(options: any): PluginOptions<any> {
if (options == null) {
options = {
enabled: false,
};
}
const defaultOptions: any = this.getStaticDefaultOptions();
let mergedConfig = configUtils.mergeConfig({}, defaultOptions.config || {}, options.config || {});
const mergedOverrides = options.replaceDefaultOverrides