0x2620/pandora
2
1
Fork 1
Code Issues 1.3k Pull requests Releases Wiki Activity

only append to documentKeys after adding defaults

Browse source
This commit is contained in:
j 2018-06-14 19:27:40 +02:00
parent 5aed135906
commit 91e0f588e5
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pandora/app/config.py
View file

@ -95,15 +95,6 @@ def load_config(init=False):
for key in config['itemKeys']: for key in config['itemKeys']:
config['keys'][key['id']] = key config['keys'][key['id']] = key
# add entities if needed
if len(config.get('entities', [])) and not [k for k in config['documentKeys'] if k['id'] == 'entites']:
config['documentKeys'].append({
'id': 'entity',
'title': 'Entity',
'type': 'string',
'find': True
})
# add missing defaults # add missing defaults
for section in sorted(( for section in sorted((
'capabilities', 'cantPlay', 'capabilities', 'cantPlay',
@ -140,6 +131,15 @@ def load_config(init=False):
sys.stderr.write("adding default %s:\n\t" % section) sys.stderr.write("adding default %s:\n\t" % section)
sys.stderr.write("\n\t".join(added) + '\n\n') sys.stderr.write("\n\t".join(added) + '\n\n')
# add entities if needed
if len(config.get('entities', [])) and not [k for k in config['documentKeys'] if k['id'] == 'entites']:
config['documentKeys'].append({
'id': 'entity',
'title': 'Entity',
'type': 'string',
'find': True
})
key = 'documentRightsLevel' key = 'documentRightsLevel'
if key not in config: if key not in config:
config[key] = {} config[key] = {}