mirror of
https://github.com/inventree/InvenTree.git
synced 2025-04-28 19:46:46 +00:00
Fix user check
This commit is contained in:
parent
164a8acf33
commit
fe4b264ae1
@ -1537,7 +1537,7 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def get_setting_object(cls, key, user):
|
def get_setting_object(cls, key, user=None):
|
||||||
return super().get_setting_object(key, user=user)
|
return super().get_setting_object(key, user=user)
|
||||||
|
|
||||||
def validate_unique(self, exclude=None, **kwargs):
|
def validate_unique(self, exclude=None, **kwargs):
|
||||||
|
@ -329,6 +329,8 @@ def settings_value(key, *args, **kwargs):
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
if 'user' in kwargs:
|
if 'user' in kwargs:
|
||||||
|
if not kwargs['user']:
|
||||||
|
return InvenTreeUserSetting.get_setting(key)
|
||||||
return InvenTreeUserSetting.get_setting(key, user=kwargs['user'])
|
return InvenTreeUserSetting.get_setting(key, user=kwargs['user'])
|
||||||
|
|
||||||
return InvenTreeSetting.get_setting(key)
|
return InvenTreeSetting.get_setting(key)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user