From 8081652208eea38b10f3d66b024ad311517b8dbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Wed, 13 Nov 2013 01:14:52 +0100 Subject: [PATCH] Fixed bug $89 (95): Now show the new value of the points field --- greenmine/base/notifications/models.py | 2 +- greenmine/projects/userstories/models.py | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/greenmine/base/notifications/models.py b/greenmine/base/notifications/models.py index a923dc68..9e8f1dea 100644 --- a/greenmine/base/notifications/models.py +++ b/greenmine/base/notifications/models.py @@ -147,7 +147,7 @@ class WatchedMixin(models.Model): def _get_changed_field(self, field_name, data_value): verbose_name = self._get_changed_field_verbose_name(field_name) - old_value = self._get_changed_field_old_value(field_name, data_value) + old_value = self._get_changed_field_old_value(field_name, None) new_value = self._get_changed_field_new_value(field_name, data_value) return { diff --git a/greenmine/projects/userstories/models.py b/greenmine/projects/userstories/models.py index 54bc081a..5f3bb237 100644 --- a/greenmine/projects/userstories/models.py +++ b/greenmine/projects/userstories/models.py @@ -123,6 +123,13 @@ class UserStory(WatchedMixin): return ", ".join(value) return value + def get_notifiable_points_display(self, value): + if isinstance(value, models.manager.Manager): + return ", ".join(["{}: {}".format(rp.role.name,rp.points.name) + for rp in self.role_points.all().order_by("role")]) + + return None + def _get_watchers_by_role(self): return { "owner": self.owner,