|
@@ -39,7 +39,8 @@ class searchUserView(View):
|
|
try:
|
|
try:
|
|
if exact == 'True' or exact == 1:
|
|
if exact == 'True' or exact == 1:
|
|
User = Device_User.objects.filter(**fieldDict).order_by('-data_joined')
|
|
User = Device_User.objects.filter(**fieldDict).order_by('-data_joined')
|
|
- elif exact == 'False' or exact == 0:
|
|
|
|
|
|
+ # elif exact == 'False' or exact == 0:
|
|
|
|
+ else:
|
|
if 'username' in fieldDict.keys():
|
|
if 'username' in fieldDict.keys():
|
|
username = fieldDict.get('username',None)
|
|
username = fieldDict.get('username',None)
|
|
User = Device_User.objects.filter(Q(username=username)|Q(phone=username)|Q(userEmail=username)).order_by('-data_joined')
|
|
User = Device_User.objects.filter(Q(username=username)|Q(phone=username)|Q(userEmail=username)).order_by('-data_joined')
|
|
@@ -51,8 +52,8 @@ class searchUserView(View):
|
|
User = Device_User.objects.filter(userID=userID).order_by('-data_joined')
|
|
User = Device_User.objects.filter(userID=userID).order_by('-data_joined')
|
|
else:
|
|
else:
|
|
User = Device_User.objects.filter(**fieldDict).order_by('-data_joined')
|
|
User = Device_User.objects.filter(**fieldDict).order_by('-data_joined')
|
|
- else:
|
|
|
|
- User = Device_User.objects.filter(**fieldDict).order_by('-data_joined')
|
|
|
|
|
|
+ # else:
|
|
|
|
+ # User = Device_User.objects.filter(**fieldDict).order_by('-data_joined')
|
|
|
|
|
|
except FieldError:
|
|
except FieldError:
|
|
return response.json(502)
|
|
return response.json(502)
|