kit-eco.social/consumocuidado-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed stats coordinates and new user company foreign key

Browse Source
This commit is contained in:
Diego Calvo
2021-04-05 14:29:54 +02:00
parent 281c02ba6c
commit 8ade7743fc
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/views.py
View File

@@ -134,7 +134,6 @@ def create_company_user(request):
# create user # create user
user_data = request.data['user'] user_data = request.data['user']
user_data['role'] = 'COOP_MANAGER' user_data['role'] = 'COOP_MANAGER'
user_data['company'] = new_company.id
user_serializer = core_serializers.CustomUserWriteSerializer( user_serializer = core_serializers.CustomUserWriteSerializer(
data=user_data, data=user_data,
) )
@@ -143,6 +142,7 @@ def create_company_user(request):
password = user_serializer.validated_data.pop('password') password = user_serializer.validated_data.pop('password')
new_user = User.objects.create_user(**user_serializer.validated_data) new_user = User.objects.create_user(**user_serializer.validated_data)
new_user.set_password(password) new_user.set_password(password)
new_user.company = new_company
new_user.save() new_user.save()
# send verification email # send verification email
utils.send_verification_email(request, new_user) utils.send_verification_email(request, new_user)
@@ -218,7 +218,6 @@ def forgotten_password(request):
if user: if user:
try: try:
password = utils.generate_password(12) password = utils.generate_password(12)
print(password)
user.set_password(password) user.set_password(password)
user.save() user.save()
except: except:

2
stats/views.py
View File

@@ -53,7 +53,7 @@ def track_user(request):
data = request.data data = request.data
if data.get('geo'): if data.get('geo'):
coordinates = (data['geo'].get('latitude'), data['geo'].get('longitude')) coordinates = (data['geo'].get('longitude'), data['geo'].get('latitude'))
else: else:
coordinates = None coordinates = None