Merge pull request #1643 from IFRCGo/hotfix/surgealert-error-500

Hotfix/surgealert error 500

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.468
+
+### Added
+ - Fix Surge Alert error 500 when no linked event
+
 ## 1.1.467
 
 ### Added
@@ -2138,7 +2143,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.467...HEAD
+[Unreleased]: https://github.com/IFRCGo/go-api/compare/1.1.468...HEAD
+[1.1.468]: https://github.com/IFRCGo/go-api/compare/1.1.467...1.1.468
 [1.1.467]: https://github.com/IFRCGo/go-api/compare/1.1.466...1.1.467
 [1.1.466]: https://github.com/IFRCGo/go-api/compare/1.1.465...1.1.466
 [1.1.465]: https://github.com/IFRCGo/go-api/compare/1.1.464...1.1.465

main/__init__.py

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

notifications/models.py

@@ -69,8 +69,12 @@ def save(self, *args, **kwargs):
     def __str__(self):
         if self.operation and self.operation != '':
             return self.operation
-        else:
+        elif self.event:
             return self.event.name
+        elif self.message:
+            return self.message
+        else:
+            return '–'
 
 
 class SubscriptionType(models.IntegerChoices):