NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fix returning default for unknown userconfig key

Browse Source
This commit is contained in:
Jeremy Stretch 2020-04-24 10:37:02 -04:00
parent 587339bea0
commit dc9617c7aa
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/users/models.py
View File

@ -49,7 +49,7 @@ class UserConfig(models.Model):
# Iterate down the hierarchy, returning the default value if any invalid key is encountered # Iterate down the hierarchy, returning the default value if any invalid key is encountered
for key in keys: for key in keys:
if type(d) is dict: if type(d) is dict and key in d:
d = d.get(key) d = d.get(key)
else: else:
return default return default

6
netbox/users/tests/test_models.py
View File

@ -45,6 +45,12 @@ class UserConfigTest(TestCase):
self.assertIsNone(userconfig.get('b.foo.invalid')) self.assertIsNone(userconfig.get('b.foo.invalid'))
self.assertIsNone(userconfig.get('b.foo.x.invalid')) self.assertIsNone(userconfig.get('b.foo.x.invalid'))
# Invalid values with a provided default should return the default
self.assertEqual(userconfig.get('invalid', 'DEFAULT'), 'DEFAULT')
self.assertEqual(userconfig.get('a.invalid', 'DEFAULT'), 'DEFAULT')
self.assertEqual(userconfig.get('b.foo.invalid', 'DEFAULT'), 'DEFAULT')
self.assertEqual(userconfig.get('b.foo.x.invalid', 'DEFAULT'), 'DEFAULT')
def test_all(self): def test_all(self):
userconfig = self.userconfig userconfig = self.userconfig
flattened_data = { flattened_data = {