pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix: setting defaults supplied to set/get from plugins are no longer overwritten

Browse source
This commit is contained in:
Gina Häußge 2015-06-19 11:08:11 +02:00
parent b40cba659a
commit 9f4a74cca0
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/octoprint/plugin/__init__.py
View file

@ -309,11 +309,17 @@ class PluginSettings(object):
return result
def add_getter_kwargs(kwargs):
kwargs.update(defaults=self.defaults, preprocessors=self.get_preprocessors)
if not "defaults" in kwargs:
kwargs.update(defaults=self.defaults)
if not "preprocessors" in kwargs:
kwargs.update(preprocessors=self.get_preprocessors)
return kwargs
def add_setter_kwargs(kwargs):
kwargs.update(defaults=self.defaults, preprocessors=self.set_preprocessors)
if not "defaults" in kwargs:
kwargs.update(defaults=self.defaults)
if not "preprocessors" in kwargs:
kwargs.update(preprocessors=self.set_preprocessors)
return kwargs
self.access_methods = dict(