Merge pull request #1787 from IFRCGo/develop

DREF users fix

Author: szabozoltan69

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.475
+
+### Added
+ - Fix for DREF users
+
 ## 1.1.474
 
 ### Added
@@ -2206,7 +2211,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## 0.1.20
 
-[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.474...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.475...HEAD
+[1.1.475]: https://github.com/IFRCGo/go-api/compare/1.1.474...1.1.475
 [1.1.474]: https://github.com/IFRCGo/go-api/compare/1.1.473...1.1.474
 [1.1.473]: https://github.com/IFRCGo/go-api/compare/1.1.472...1.1.473
 [1.1.472]: https://github.com/IFRCGo/go-api/compare/1.1.471...1.1.472

dref/serializers.py

@@ -408,6 +408,8 @@ class DrefOperationalUpdateSerializer(NestedUpdateMixin, NestedCreateMixin, seri
     assessment_report_details = DrefFileSerializer(source="assessment_report", read_only=True)
     risk_security = RiskSecuritySerializer(many=True, required=False)
     modified_at = serializers.DateTimeField(required=False)
+    created_by_details = UserNameSerializer(source="created_by", read_only=True)
+    users_details = UserNameSerializer(source="users", many=True, read_only=True)
 
     class Meta:
         model = DrefOperationalUpdate
@@ -765,6 +767,8 @@ class DrefFinalReportSerializer(NestedUpdateMixin, NestedCreateMixin, serializer
     risk_security = RiskSecuritySerializer(many=True, required=False)
     modified_at = serializers.DateTimeField(required=False)
     financial_report_details = DrefFileSerializer(source="financial_report", read_only=True)
+    created_by_details = UserNameSerializer(source="created_by", read_only=True)
+    users_details = UserNameSerializer(source="users", many=True, read_only=True)
 
     class Meta:
         model = DrefFinalReport

main/__init__.py

@@ -3,4 +3,4 @@
 from .celery import app as celery_app
 
 __all__ = ['celery_app']
-__version__ = '1.1.474'
+__version__ = '1.1.475'