[#797] Merge branch 'feature/835_v3_my_details' into feature/797_v3_c…

…hange_pw

akvo/rest/serializers/employment.py

@@ -8,14 +8,21 @@
 
 from akvo.rsr.models import Employment
 
+from .country import CountrySerializer
+from .organisation import OrganisationSerializer
 from .rsr_serializer import BaseRSRSerializer
+from .user import UserSerializer
 
 
 class EmploymentSerializer(BaseRSRSerializer):
 
-    organisation_name = serializers.Field(source='organisation.name')
+    # These two can be deleted, but are still used somewhere
+    organisation_name = serializers.Field(source='organisation.long_name')
     country_name = serializers.Field(source='country.name')
 
+    organisation_full = OrganisationSerializer(source='organisation', required=False, read_only=True)
+    user_full = UserSerializer(source='user', required=False, read_only=True)
+    country_full = CountrySerializer(source='country', required=False, read_only=True)
 
     class Meta:
         model = Employment

akvo/rsr/models/employment.py

@@ -30,10 +30,13 @@ def __unicode__(self):
         return self.user.first_name, self.user.last_name, ":", self.organisation.name
 
     def to_dict(self):
+        country = '' if not self.country else model_to_dict(self.country)
+
         return dict(
             id=self.pk,
-            organisation=model_to_dict(self.organisation, fields=['id', 'name', 'long_name',]),
-            user=model_to_dict(self.user, fields=['id', 'first_name', 'last_name', 'email',]),
+            organisation_full=model_to_dict(self.organisation, fields=['id', 'name', 'long_name',]),
+            user_full=model_to_dict(self.user, fields=['id', 'first_name', 'last_name', 'email',]),
             is_approved=self.is_approved,
             job_title=self.job_title,
+            country_full=country,
         )

akvo/rsr/models/user.py

@@ -256,6 +256,7 @@ def employments_dict(self):
             employments_array.append(employment_obj)
 
         return dict(
+            id=self.pk,
             email=self.email,
             first_name=self.first_name,
             last_name=self.last_name,