Put a unified way to generate history to issues and user stories.
parent
61ce2d1acc
commit
60e028e38b
|
@ -89,4 +89,4 @@ class IssueViewSet(NotificationSenderMixin, ModelCrudViewSet):
|
||||||
if "comment" in self.request.DATA:
|
if "comment" in self.request.DATA:
|
||||||
# Update the comment in the last version
|
# Update the comment in the last version
|
||||||
reversion.set_comment(self.request.DATA["comment"])
|
reversion.set_comment(self.request.DATA["comment"])
|
||||||
super(IssueViewSet, self).post_save(obj, created)
|
super().post_save(obj, created)
|
||||||
|
|
|
@ -19,7 +19,6 @@ class IssueSerializer(serializers.ModelSerializer):
|
||||||
model = models.Issue
|
model = models.Issue
|
||||||
|
|
||||||
def get_comment(self, obj):
|
def get_comment(self, obj):
|
||||||
# TODO
|
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
def get_issues_diff(self, old_issue_version, new_issue_version):
|
def get_issues_diff(self, old_issue_version, new_issue_version):
|
||||||
|
@ -28,8 +27,8 @@ class IssueSerializer(serializers.ModelSerializer):
|
||||||
|
|
||||||
diff_dict = {
|
diff_dict = {
|
||||||
"modified_date": new_obj["modified_date"],
|
"modified_date": new_obj["modified_date"],
|
||||||
"by": old_issue_version.revision.user,
|
"by": new_issue_version.revision.user,
|
||||||
"comment": old_issue_version.revision.comment,
|
"comment": new_issue_version.revision.comment,
|
||||||
}
|
}
|
||||||
|
|
||||||
for key in old_obj.keys():
|
for key in old_obj.keys():
|
||||||
|
@ -51,7 +50,7 @@ class IssueSerializer(serializers.ModelSerializer):
|
||||||
current = None
|
current = None
|
||||||
|
|
||||||
if obj:
|
if obj:
|
||||||
for version in reversed(list(reversion.get_for_object(obj))):
|
for version in reversion.get_for_object(obj).order_by("revision__date_created"):
|
||||||
if current:
|
if current:
|
||||||
issues_diff = self.get_issues_diff(current, version)
|
issues_diff = self.get_issues_diff(current, version)
|
||||||
diff_list.append(issues_diff)
|
diff_list.append(issues_diff)
|
||||||
|
|
|
@ -48,11 +48,7 @@ class UserStorySerializer(serializers.ModelSerializer):
|
||||||
return obj.get_total_points()
|
return obj.get_total_points()
|
||||||
|
|
||||||
def get_comment(self, obj):
|
def get_comment(self, obj):
|
||||||
version_list = reversion.get_for_object(obj)
|
return ""
|
||||||
if len(version_list) > 0:
|
|
||||||
return version_list[0].revision.comment
|
|
||||||
else:
|
|
||||||
return None
|
|
||||||
|
|
||||||
def get_user_stories_diff(self, old_us_version, new_us_version):
|
def get_user_stories_diff(self, old_us_version, new_us_version):
|
||||||
old_obj = old_us_version.field_dict
|
old_obj = old_us_version.field_dict
|
||||||
|
@ -83,7 +79,7 @@ class UserStorySerializer(serializers.ModelSerializer):
|
||||||
current = None
|
current = None
|
||||||
|
|
||||||
if obj:
|
if obj:
|
||||||
for version in reversed(list(reversion.get_for_object(obj))):
|
for version in reversion.get_for_object(obj).order_by("revision__date_created"):
|
||||||
if current:
|
if current:
|
||||||
us_diff = self.get_user_stories_diff(current, version)
|
us_diff = self.get_user_stories_diff(current, version)
|
||||||
diff_list.append(us_diff)
|
diff_list.append(us_diff)
|
||||||
|
|
Loading…
Reference in New Issue