space
This commit is contained in:
parent
1c580a2df7
commit
0f0f5f42d8
1 changed files with 3 additions and 3 deletions
|
@ -237,6 +237,7 @@ def get_ui(user_ui, user=None):
|
|||
ui = {}
|
||||
config = copy.deepcopy(settings.CONFIG)
|
||||
ui.update(config['user']['ui'])
|
||||
|
||||
def update_ui(ui, new):
|
||||
'''
|
||||
only update set keys in dicts
|
||||
|
@ -390,7 +391,6 @@ def has_capability(user, capability):
|
|||
return level in settings.CONFIG['capabilities'][capability] \
|
||||
and settings.CONFIG['capabilities'][capability][level]
|
||||
|
||||
|
||||
def merge_users(old, new):
|
||||
old.annotations.all().update(user=new)
|
||||
old.edits.all().update(user=new)
|
||||
|
|
Loading…
Reference in a new issue