Commit 0ba423f4 authored by John Red Medrano's avatar John Red Medrano

Merge pull request #500 in RMS/api-main-service from red-develop to RMSv2

* commit '937e7b5e':
  bug fix on company name and company code template user list endpoint
parents 50fdf03c 937e7b5e
...@@ -52,8 +52,8 @@ class ChangeRequestList(serializers.ModelSerializer): ...@@ -52,8 +52,8 @@ class ChangeRequestList(serializers.ModelSerializer):
def to_representation(self, instance): def to_representation(self, instance):
ret = super().to_representation(instance) ret = super().to_representation(instance)
ret['company_name'] = instance.department.company.code ret['company_name'] = instance.department.company.name
ret['company_code'] = instance.department.company.name ret['company_code'] = instance.department.company.code
ret['department_code'] = instance.department.code ret['department_code'] = instance.department.code
ret['department_name'] = instance.department.name ret['department_name'] = instance.department.name
return ret return ret
......
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