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

space

Browse source
This commit is contained in:
j 2016-08-31 19:07:44 +02:00
parent 1c580a2df7
commit 0f0f5f42d8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pandora/user/models.py
View file

@ -47,7 +47,7 @@ class SessionData(models.Model):
objects = managers.SessionDataManager() objects = managers.SessionDataManager()
groupssort = models.CharField(default=None,blank=True,null=True, max_length=255) groupssort = models.CharField(default=None, blank=True, null=True, max_length=255)
def __unicode__(self): def __unicode__(self):
return u"%s" % self.session_key return u"%s" % self.session_key
@ -237,6 +237,7 @@ def get_ui(user_ui, user=None):
ui = {} ui = {}
config = copy.deepcopy(settings.CONFIG) config = copy.deepcopy(settings.CONFIG)
ui.update(config['user']['ui']) ui.update(config['user']['ui'])
def update_ui(ui, new): def update_ui(ui, new):
''' '''
only update set keys in dicts only update set keys in dicts
@ -388,8 +389,7 @@ def has_capability(user, capability):
else: else:
level = user.profile.get_level() level = user.profile.get_level()
return level in settings.CONFIG['capabilities'][capability] \ return level in settings.CONFIG['capabilities'][capability] \
and settings.CONFIG['capabilities'][capability][level] and settings.CONFIG['capabilities'][capability][level]
def merge_users(old, new): def merge_users(old, new):
old.annotations.all().update(user=new) old.annotations.all().update(user=new)