Commit bd12f3af authored by John Red Medrano's avatar John Red Medrano

Merge branch 'RMSv2' of http://42.61.118.105:7990/scm/rms/api-main-service into red-develop

parents 32a7b019 5bdbb8bf
...@@ -345,7 +345,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet): ...@@ -345,7 +345,7 @@ class ChangeRequestFormsViewset(meviewsets.ModelViewSet):
) )
if action.lower() == 'approved': if action.lower() == 'approved':
models.ChangeRequestFormApprovers.objects.filter( models.ChangeRequestFormApprovers.objects.filter(
Q(form_code=form_code) & Q(level=str(next_level)) Q(form_code=form_code) & Q(level=str(next_level))
).update( ).update(
......
...@@ -49,7 +49,7 @@ def account_created(args): ...@@ -49,7 +49,7 @@ def account_created(args):
) )
return True return True
# direct mailer from django
def forgot_password(args): def forgot_password(args):
reset_code = args[0] reset_code = args[0]
url = args[1] url = args[1]
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment