mirror of
https://github.com/inventree/InvenTree.git
synced 2025-05-01 04:56:45 +00:00
* fix settings function callback * merge instance filters and passed keys (cherry picked from commit df77305d60788af1c758e4c1289530138622c260) Co-authored-by: Matthias Mair <code@mjmair.com>
This commit is contained in:
parent
ab22f2a04d
commit
e1a0e79ead
@ -190,7 +190,7 @@ class BaseInvenTreeSetting(models.Model):
|
|||||||
kwargs: Keyword arguments to pass to the function
|
kwargs: Keyword arguments to pass to the function
|
||||||
"""
|
"""
|
||||||
# Get action
|
# Get action
|
||||||
setting = self.get_setting_definition(self.key, *args, **kwargs)
|
setting = self.get_setting_definition(self.key, *args, **{**self.get_filters_for_instance(), **kwargs})
|
||||||
settings_fnc = setting.get(reference, None)
|
settings_fnc = setting.get(reference, None)
|
||||||
|
|
||||||
# Execute if callable
|
# Execute if callable
|
||||||
|
Loading…
x
Reference in New Issue
Block a user