Commit 9b24548a authored by Gladys Forte's avatar Gladys Forte

bug fix serializer approver

parent 8ed14162
...@@ -51,7 +51,7 @@ class ChangeRequestFormApproversSerializer( ...@@ -51,7 +51,7 @@ class ChangeRequestFormApproversSerializer(
else: else:
ret['editable_dept'] = True ret['editable_dept'] = True
if instance.tmp_approver.delegation or instance.tmp_approver.delegation.name.lower() == 'requestor': if instance.tmp_approver.delegation.code or instance.tmp_approver.delegation.name.lower() == 'requestor':
ret['editable_deleg'] = False ret['editable_deleg'] = False
else: else:
ret['editable_deleg'] = True ret['editable_deleg'] = True
...@@ -102,7 +102,8 @@ class ChangeRequestFormApproversSerializer( ...@@ -102,7 +102,8 @@ class ChangeRequestFormApproversSerializer(
ret['department'] = None ret['department'] = None
ret['editable_dept'] = True ret['editable_dept'] = True
if instance.tmp_approver.delegation or instance.tmp_approver.delegation.name.lower() == 'requestor': if instance.tmp_approver.delegation.code or instance.tmp_approver.delegation.name.lower() == 'requestor':
ret['delegation'] = { ret['delegation'] = {
"id": instance.tmp_approver.delegation.id, "id": instance.tmp_approver.delegation.id,
"code": instance.tmp_approver.delegation.code, "code": instance.tmp_approver.delegation.code,
......
...@@ -485,7 +485,7 @@ def crhistory_log_bulk_delete_masterattach(queryset, entity, tbl, form_code, ...@@ -485,7 +485,7 @@ def crhistory_log_bulk_delete_masterattach(queryset, entity, tbl, form_code,
try: try:
for data in queryset: for data in queryset:
test = model_to_dict(data) test = model_to_dict(data)
print(test) # print(test)
crhistory_save(batch_no, crhistory_save(batch_no,
main_action, main_action,
enums.CREnum.DELETED.value, enums.CREnum.DELETED.value,
...@@ -496,21 +496,21 @@ def crhistory_log_bulk_delete_masterattach(queryset, entity, tbl, form_code, ...@@ -496,21 +496,21 @@ def crhistory_log_bulk_delete_masterattach(queryset, entity, tbl, form_code,
tbl.objects.filter(id=test['id']).delete() tbl.objects.filter(id=test['id']).delete()
url = models.MasterAttachment.objects.get(id=test['file_upload']) # url = models.MasterAttachment.objects.get(id=test['file_upload'])
models.MasterAttachment.objects.filter( # models.MasterAttachment.objects.filter(
id=test['file_upload']).delete() # id=test['file_upload']).delete()
r = model_to_dict(url) # r = model_to_dict(url)
print(r['url']) # print(r['url'])
print(settings.MEDIA_ROOT) # print(settings.MEDIA_ROOT)
# os.remove(r['url']) # # os.remove(r['url'])
x = os.path.join(settings.MEDIA_ROOT, r['url']) # x = os.path.join(settings.MEDIA_ROOT, r['url'])
print(x) # print(x)
if os.path.exists(os.path.join(settings.MEDIA_ROOT, r['url'])): # if os.path.exists(os.path.join(settings.MEDIA_ROOT, r['url'])):
print("file exists") # print("file exists")
# os.remove(r['url']) # # os.remove(r['url'])
else: # else:
print("The file does not exist") # print("The file does not exist")
return True return True
except IntegrityError as exc: except IntegrityError as exc:
......
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