Merge pull request #2677 from onaio/fix-2676

Fix exception thrown when updating organization profile

onadata/apps/api/tests/viewsets/test_organization_profile_viewset.py

@@ -1054,8 +1054,8 @@ def test_put_role_user_none_existent(self):
     def test_update_org_name(self):
         self._org_create()
 
-        # update name
-        data = {"name": "Dennis2"}
+        # update name and email
+        data = {"name": "Dennis2", "email": "[email protected]"}
         request = self.factory.patch("/", data=data, **self.extra)
         response = self.view(request, user="denoinc")
         self.assertEqual(response.data["name"], "Dennis2")

onadata/libs/serializers/organization_serializer.py

@@ -71,8 +71,11 @@ def update(self, instance, validated_data):
             first_name, last_name = _get_first_last_names(validated_data.get("name"))
             instance.user.first_name = first_name
             instance.user.last_name = last_name
-            instance.user.save()
 
+        if "email" in validated_data:
+            instance.user.email = validated_data.pop("email")
+
+        instance.user.save()
         return super().update(instance, validated_data)
 
     def create(self, validated_data):