Merge branch 'haow/dev' into 'test'

sun user add roles

See merge request !183

api/account.py

@@ -114,6 +114,9 @@ class LoginView(APIView):
             error_logger.error(u'登陆失败%s', e)
             raise
         if data['is_staff']:
+            if data.get('staff_level'):
+                ret.update({'roles': ['mbhoperator']})
+            else:    
                 ret.update({'roles': ['staff']})
         else:
             ret.update({'roles': ['anonymous']})