11

Controller/UidSetController.py

@@ -304,4 +304,4 @@ class UidSetView(View):
         except Exception:
             errorInfo = traceback.format_exc()
             print(errorInfo)
-            return response.json(500, {'details': errorInfo})
+            return response.json(500, {'details': errorInfo})

Controller/UserController.py

@@ -2069,7 +2069,7 @@ class alexaUidView(TemplateView):
             uid_list = []
             for uid_q in uid_qs:
                 uid_list.append(uid_q['UID'])
-                uid_arr.append({'uid': uid_q['UID'], 'nick': uid_q['NickName'], 'password': uid_q['View_Password']})
+                uid_arr.append({'uid': uid_q['UID'], 'nick': uid_q['NickName'], 'password': uid_q['View_Password'],})
             res = {
                 'uid_arr': uid_arr
             }
@@ -2088,12 +2088,16 @@ class alexaUidView(TemplateView):
             for uid_q in uid_qs:
                 uid_list.append(uid_q['UID'])
                 uid_dict[uid_q['UID']] = {'nick': uid_q['NickName'], 'password': uid_q['View_Password']}
-            us_qs = UidSetModel.objects.filter(uid__in=uid_list, is_alexa=1).values('uid')
+            us_qs = UidSetModel.objects.filter(uid__in=uid_list, is_alexa=1).values('uid', 'p2p_region')
             uid_arr = []
             for us in us_qs:
                 uid = us['uid']
+                p2p_region = us['p2p_region']
+                if p2p_region == '':
+                    p2p_region = "en"
                 # uid_arr.append({'uid': uid, 'nick': uid_dict[uid]['nick'], 'password': uid_dict['uid']['password']})
-                uid_arr.append({'uid': uid, 'nick': uid_dict[uid]['nick'], 'password': uid_dict[uid]['password']})
+                uid_arr.append({'uid': uid, 'nick': uid_dict[uid]['nick'], 'password': uid_dict[uid]['password'],
+                                'region': p2p_region})
             res = {
                 'uid_arr': uid_arr
             }