|
@@ -3806,14 +3806,15 @@ class alexaUidView(TemplateView):
|
|
|
|
|
|
if sid != 'admin' or sst != 'admin':
|
|
|
return response.json(107)
|
|
|
- uid_qs = Device_Info.objects.filter(userID_id=userID, isExist=1).values('UID', 'NickName', 'View_Password',
|
|
|
- 'userID__region_country')
|
|
|
+ uid_qs = Device_Info.objects.filter(userID_id=userID, isExist=1).values(
|
|
|
+ 'UID', 'NickName', 'View_Password', 'userID__region_country', 'serial_number')
|
|
|
if not uid_qs.exists():
|
|
|
return response.json(107)
|
|
|
country_qs = CountryModel.objects.filter(id=uid_qs[0]['userID__region_country']).values(
|
|
|
'region__continent_code')
|
|
|
|
|
|
try:
|
|
|
+ serial_number = uid_qs[0]['serial_number']
|
|
|
uid_dict = {}
|
|
|
uid_list = []
|
|
|
for uid_q in uid_qs:
|
|
@@ -3843,10 +3844,11 @@ class alexaUidView(TemplateView):
|
|
|
for uid_channel_set in uid_channel_set_qs:
|
|
|
uid_arr.append({'uid': uid, 'nick': uid_channel_set['channel_name'], 'region': region_alexa,
|
|
|
'password': uid_dict[uid]['password'], 'multi_channel': 1,
|
|
|
- 'channel': uid_channel_set['channel']})
|
|
|
+ 'channel': uid_channel_set['channel'], 'serial_number': serial_number})
|
|
|
else:
|
|
|
uid_arr.append({'uid': uid, 'nick': uid_dict[uid]['nick'], 'region': region_alexa,
|
|
|
- 'password': uid_dict[uid]['password'], 'multi_channel': 0})
|
|
|
+ 'password': uid_dict[uid]['password'], 'multi_channel': 0,
|
|
|
+ 'serial_number': serial_number})
|
|
|
res = {
|
|
|
'uid_arr': uid_arr
|
|
|
}
|