Merge pull request #1863 from IFRCGo/master

Master -> Develop

Author: thenav56

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## 1.1.485
+
+### Added
+ - Add disaster_type details in dref final report
+
 ## 1.1.484
 
 ### Added
@@ -2267,7 +2272,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.484...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.485...HEAD
+[1.1.485]: https://github.com/IFRCGo/go-api/compare/1.1.484...1.1.485
 [1.1.484]: https://github.com/IFRCGo/go-api/compare/1.1.483...1.1.484
 [1.1.483]: https://github.com/IFRCGo/go-api/compare/1.1.482...1.1.483
 [1.1.482]: https://github.com/IFRCGo/go-api/compare/1.1.481...1.1.482

dref/serializers.py

@@ -915,6 +915,7 @@ class DrefFinalReportSerializer(NestedUpdateMixin, NestedCreateMixin, ModelSeria
     created_by_details = UserNameSerializer(source="created_by", read_only=True)
     users_details = UserNameSerializer(source="users", many=True, read_only=True)
     modified_by_details = UserNameSerializer(source="modified_by", read_only=True)
+    disaster_type_details = DisasterTypeSerializer(source="disaster_type", 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.484'
+__version__ = '1.1.485'