fixed bug for device with password=None

sunhoww · Apr 1, 2016 · b55020f · b55020f
1 parent f98f7f2
commit b55020f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/syncer/controllers.py b/syncer/controllers.py
@@ -37,8 +37,9 @@ def get_conf(p):
         # tmp['id'] = d.id
         tmp['name'] = d.name
         tmp['number'] = d.number
-        tmp['commands'] = d.commands()
-        tmp['alerts'] = d.alerts()
+        if not d.password is None:
+            tmp['commands'] = d.commands()
+            tmp['alerts'] = d.alerts()
         resp['devices'].append(tmp)
     return resp
 

diff --git a/syncer/models.py b/syncer/models.py
@@ -121,7 +121,7 @@ def get_msgs(self):
         for m in self.messages.all():
                 tmp = {}
                 tmp['id'] = m.id
-                tmp['deviceid'] = m.user.id
+                tmp['userid'] = m.user.id
                 tmp['time'] = m.time
                 tmp['body'] = m.body
                 tmp['direction'] = m.direction