Commit 6d762481 authored by John Red Medrano's avatar John Red Medrano

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

* commit '8ec41d6d':
  change the value of key user to user instance
parents 4460eeec 8ec41d6d
...@@ -14,9 +14,14 @@ class ChangeRequestTemplateApproversSerializer( ...@@ -14,9 +14,14 @@ class ChangeRequestTemplateApproversSerializer(
def to_representation(self, instance): def to_representation(self, instance):
ret = super().to_representation(instance) ret = super().to_representation(instance)
try: try:
user_object = {
"id": instance.user.id
"name": instance.user.name
"username": instance.user.username
}
ret['company'] = model_to_dict(instance.user.department.company) ret['company'] = model_to_dict(instance.user.department.company)
ret['department'] = model_to_dict(instance.user.department) ret['department'] = model_to_dict(instance.user.department)
ret['user'] = model_to_dict(instance.user) ret['user'] = user_object
return ret return ret
...@@ -24,8 +29,6 @@ class ChangeRequestTemplateApproversSerializer( ...@@ -24,8 +29,6 @@ class ChangeRequestTemplateApproversSerializer(
ret['company'] = "none" ret['company'] = "none"
ret['department'] = "none" ret['department'] = "none"
ret['name'] = "none" ret['name'] = "none"
ret['email'] = "none"
ret['contact_no'] = "none"
return ret return ret
class Meta: class Meta:
......
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