0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

dont fail without nodes

Browse source
This commit is contained in:
j 2016-01-05 23:22:17 +05:30
parent 55ba49b631
commit 8aef4a62ef
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
oml/user/api.py
View file

@ -87,12 +87,13 @@ def getUsers(data):
for u in models.User.query.filter(models.User.id!=settings.USER_ID).all(): for u in models.User.query.filter(models.User.id!=settings.USER_ID).all():
users.append(u.json()) users.append(u.json())
ids.add(u.id) ids.add(u.id)
for id in state.nodes._local._nodes: if state.nodes:
if id not in ids: for id in state.nodes._local._nodes:
n = state.nodes._local._nodes[id].copy() if id not in ids:
n['online'] = True n = state.nodes._local._nodes[id].copy()
n['name'] = n['username'] n['online'] = True
users.append(n) n['name'] = n['username']
users.append(n)
users.sort(key=lambda u: ox.sort_string(str(u.get('index', '')) + 'Z' + (u.get('name') or ''))) users.sort(key=lambda u: ox.sort_string(str(u.get('index', '')) + 'Z' + (u.get('name') or '')))
return { return {
"users": users "users": users