Remove support for status date on doc

- Legacy-Id: 3720
This commit is contained in:
Ole Laursen 2011-11-28 18:28:20 +00:00
parent 79ea179ff9
commit 16540e565b
4 changed files with 2 additions and 19 deletions

View file

@ -122,7 +122,6 @@ admin.site.register(DocEvent, DocEventAdmin)
admin.site.register(NewRevisionDocEvent, DocEventAdmin)
admin.site.register(WriteupDocEvent, DocEventAdmin)
admin.site.register(StatusDateDocEvent, DocEventAdmin)
admin.site.register(LastCallDocEvent, DocEventAdmin)
admin.site.register(TelechatDocEvent, DocEventAdmin)

View file

@ -295,8 +295,6 @@ EVENT_TYPES = [
("requested_last_call", "Requested last call"),
("sent_last_call", "Sent last call"),
("changed_status_date", "Changed status date"),
("scheduled_for_telechat", "Scheduled for telechat"),
("iesg_approved", "IESG approved document (no problem)"),
@ -334,9 +332,6 @@ class BallotPositionDocEvent(DocEvent):
class WriteupDocEvent(DocEvent):
text = models.TextField(blank=True)
class StatusDateDocEvent(DocEvent):
date = models.DateField(blank=True, null=True)
class LastCallDocEvent(DocEvent):
expires = models.DateTimeField(blank=True, null=True)

View file

@ -333,8 +333,7 @@ class InternetDraft(Document):
#status_date = models.DateField(blank=True,null=True)
@property
def status_date(self):
e = self.latest_event(StatusDateDocEvent, type="changed_status_date")
return e.date if e else None
return self.time.date()
#email_display = models.CharField(blank=True, max_length=50) # unused
#agenda = models.IntegerField(null=True, blank=True)

View file

@ -500,7 +500,7 @@ def import_from_idinternal(d, idinternal):
# status date changed
match = re_status_date_changed.search(line)
if match:
e = StatusDateDocEvent(type="changed_status_date", date=date_in_match(match))
e = DocEvent(type="added_comment")
e.desc = line
save_docevent(d, e, c)
handled = True
@ -589,16 +589,6 @@ def import_from_idinternal(d, idinternal):
made_up_date = d.time
made_up_date += datetime.timedelta(seconds=1)
e = d.latest_event(StatusDateDocEvent, type="changed_status_date")
status_date = e.date if e else None
if idinternal.status_date != status_date:
e = StatusDateDocEvent(type="changed_status_date", date=idinternal.status_date)
e.time = made_up_date
e.by = system
e.doc = d
e.desc = "Status date has been changed to <b>%s</b> from <b>%s</b>" % (idinternal.status_date, status_date)
e.save()
e = d.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
telechat_date = e.telechat_date if e else None
if not idinternal.agenda: