Merged in changes from former milestones branch

 - Legacy-Id: 4516

Author: OleLaursen

ietf/doc/models.py

@@ -314,6 +314,7 @@ class DocReminder(models.Model):
     # WG events
     ("changed_group", "Changed group"),
     ("changed_protocol_writeup", "Changed protocol writeup"),
+    ("changed_charter_milestone", "Changed charter milestone"),
 
     # charter events
     ("initial_review", "Set initial review time"),

ietf/group/admin.py

@@ -116,8 +116,8 @@ class GroupHistoryAdmin(admin.ModelAdmin):
 admin.site.register(GroupHistory, GroupHistoryAdmin)
 
 class GroupMilestoneAdmin(admin.ModelAdmin):
-    list_display = ["group", "desc", "expected_due_date", "time"]
-    search_fields = ["group__name", "group__acronym", "desc"]
+    list_display = ["group", "desc", "due", "resolved", "time"]
+    search_fields = ["group__name", "group__acronym", "desc", "resolved"]
     raw_id_fields = ["group"]
 
 admin.site.register(GroupMilestone, GroupMilestoneAdmin)

ietf/group/migrations/0001_initial.py

@@ -60,17 +60,31 @@ class GroupURL(models.Model):
     def __unicode__(self):
 	return u"%s (%s)" % (self.url, self.name)
 
-class GroupMilestone(models.Model):
+class GroupMilestoneInfo(models.Model):
     group = models.ForeignKey(Group)
-    desc = models.TextField(verbose_name="Description")
-    expected_due_date = models.DateField()
-    done = models.BooleanField()
-    done_date = models.DateField(null=True, blank=True)
+    # a group has two sets of milestones, current milestones
+    # (active/under review/deleted) and charter milestones (active
+    # during a charter/recharter event), events for charter milestones
+    # are stored on the charter document
+    state = models.ForeignKey(GroupMilestoneStateName)
+    desc = models.CharField(verbose_name="Description", max_length=500)
+    due = models.DateField()
+    resolved = models.CharField(max_length=50, blank=True, help_text="Explanation of why milestone is resolved (usually \"Done\"), or empty if still due")
     time = models.DateTimeField(auto_now=True)
+
+    docs = models.ManyToManyField('doc.Document', blank=True)
+
     def __unicode__(self):
 	return self.desc[:20] + "..."
     class Meta:
-	ordering = ['expected_due_date']
+        abstract = True
+	ordering = ['due', 'id']
+
+class GroupMilestone(GroupMilestoneInfo):
+    pass
+
+class GroupMilestoneHistory(GroupMilestoneInfo):
+    milestone = models.ForeignKey(GroupMilestone, related_name="history_set")
 
 class GroupStateTransitions(models.Model):
     """Captures that a group has overriden the default available
@@ -87,6 +101,7 @@ def __unicode__(self):
     ("added_comment", "Added comment"),
     ("info_changed", "Changed metadata"),
     ("requested_close", "Requested closing group"),
+    ("changed_milestone", "Changed milestone"),
     ]
 
 class GroupEvent(models.Model):
@@ -106,6 +121,9 @@ class Meta:
 class ChangeStateGroupEvent(GroupEvent):
     state = models.ForeignKey(GroupStateName)
 
+class MilestoneGroupEvent(GroupEvent):
+    milestone = models.ForeignKey(GroupMilestone)
+
 class Role(models.Model):
     name = models.ForeignKey(RoleName)
     group = models.ForeignKey(Group)

ietf/group/migrations/0002_auto__add_milestonegroupevent__del_field_groupmilestone_expected_due_d.py

@@ -3,33 +3,21 @@
 from django.conf import settings
 
 from ietf.group.models import *
+from ietf.utils.history import get_history_object_for, copy_many_to_many_for_history
 
 
 def save_group_in_history(group):
-    def get_model_fields_as_dict(obj):
-        return dict((field.name, getattr(obj, field.name))
-                    for field in obj._meta.fields
-                    if field is not obj._meta.pk)
-
-    # copy fields
-    fields = get_model_fields_as_dict(group)
-    del fields["charter"] # Charter is saved canonically on Group
-    fields["group"] = group
-    
-    grouphist = GroupHistory(**fields)
-    grouphist.save()
+    h = get_history_object_for(group)
+    h.save()
 
     # save RoleHistory
     for role in group.role_set.all():
         rh = RoleHistory(name=role.name, group=grouphist, email=role.email, person=role.person)
         rh.save()
 
-    # copy many to many
-    for field in group._meta.many_to_many:
-        if field.rel.through and field.rel.through._meta.auto_created:
-            setattr(grouphist, field.name, getattr(group, field.name).all())
+    copy_many_to_many_for_history(h, group)
 
-    return grouphist
+    return h
 
 def get_charter_text(group):
     # get file path from settings. Syntesize file name from path, acronym, and suffix
@@ -55,3 +43,12 @@ def get_charter_text(group):
         except BaseException:    
             desc = 'Error Loading Work Group Description'
         return desc
+
+def save_milestone_in_history(milestone):
+    h = get_history_object_for(milestone)
+    h.milestone = milestone
+    h.save()
+
+    copy_many_to_many_for_history(h, milestone)
+
+    return h