Skip to content

R
red-ci-cd
Commit 7922187d authored by Gladys Forte's avatar Gladys Forte
Browse files
Options

Merge pull request #392 in RMS/api-main-service from gladys-dev2 to RMSv2 

* commit '71949aa2':
  fix rejected
parents 02810084 71949aa2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
app/applicationlayer/cms/form/header/views.py
View file @ 7922187d
...@@ -793,6 +793,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -793,6 +793,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
) )
if not prev_vendor.count() > 0: if not prev_vendor.count() > 0:
print("pasok")
models.ChangeRequestFormHeader.objects.filter( models.ChangeRequestFormHeader.objects.filter(
form_code=form_code form_code=form_code
).update(status='Rejected') ).update(status='Rejected')
...@@ -836,10 +837,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet): ...@@ -836,10 +837,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
action_date=datetime.now(), action_date=datetime.now(),
date_sent=datetime.now() date_sent=datetime.now()
) )
# update is_action for current level level = last_action_vendor.level + 1
if last_action_vendor:
level = last_action_vendor.level + 1
models.ChangeRequestFormApprovers.objects.filter( models.ChangeRequestFormApprovers.objects.filter(
Q(form_code=form_code) & Q(level__gte=int(level)) Q(form_code=form_code) & Q(level__gte=int(level))
......
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