cwinfo/powerdns-admin
4
0
Fork 0
mirror of https://github.com/cwinfo/powerdns-admin.git synced 2025-06-15 20:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated issue templates to include latest version release.

Browse Source 
Added `VERSION` file to repository root for easy tracking of current app version.

Corrected bug with the latest changes to the settings model that can lead to a JSON decoding error for installations without a properly stored value.
This commit is contained in:
Matt Scott
2023-04-12 05:30:06 -04:00
parent a8895ffe7a
commit e45324c619
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
powerdnsadmin/models/setting.py
View File

@ -459,12 +459,13 @@ class Setting(db.Model):
def convert_type(self, name, value):
import json
from json import JSONDecodeError
if name in self.types:
var_type = self.types[name]
# Handle boolean values
if var_type == bool:
if value == 'True' or value == 'true' or value == '1' or value == True:
if value == 'True' or value == 'true' or value == '1' or value is True:
return True
else:
return False
@ -477,8 +478,11 @@ class Setting(db.Model):
if var_type == int:
return int(value)
if var_type == dict or var_type == list:
return json.loads(value)
if (var_type == dict or var_type == list) and isinstance(value, str) and len(value) > 0:
try:
return json.loads(value)
except JSONDecodeError as e:
pass
if var_type == str:
return str(value)