Port edit info view with tests to new schema

 - Legacy-Id: 2823

Author: OleLaursen

ietf/idrfc/fixtures/names.xml

@@ -371,6 +371,11 @@
         <field type="TextField" name="desc"></field>
         <field type="BooleanField" name="used">1</field>
     </object>
+    <object pk="ex-ad" model="name.rolename">
+        <field type="CharField" name="name">Ex-Area Director</field>
+        <field type="TextField" name="desc">In-active Area Director</field>
+        <field type="BooleanField" name="used">1</field>
+    </object>
     <object pk="std" model="name.stdlevelname">
         <field type="CharField" name="name">Standard</field>
         <field type="TextField" name="desc"></field>

ietf/idrfc/mails.py

@@ -54,7 +54,7 @@ def email_ownerREDESIGN(request, doc, owner, changed_by, text, subject=None):
     to = owner.formatted_email()
     send_mail(request, to,
               "DraftTracker Mail System <iesg-secretary@ietf.org>",
-              "%s updated by %s" % (doc.file_tag(), changed_by),
+              "%s updated by %s" % (doc.file_tag(), changed_by.get_name()),
               "idrfc/change_notice.txt",
               dict(text=html_to_text(text),
                    doc=doc,

ietf/idrfc/testsREDESIGN.py

@@ -1,3 +1,5 @@
+from django.conf import settings
+
 from ietf.idtracker.models import InternetDraft, DocumentComment, BallotInfo, IESGLogin
 from ietf.idrfc.mails import *
 
@@ -92,3 +94,57 @@ def update_telechat(request, idinternal, new_telechat_date, new_returning_item=N
                              (new_telechat_date,
                               idinternal.telechat_date))
         idinternal.telechat_date = new_telechat_date
+
+def update_telechatREDESIGN(request, doc, by, new_telechat_date, new_returning_item=None):
+    on_agenda = bool(new_telechat_date)
+
+    from doc.models import Telechat
+    prev = doc.latest_event(Telechat, type="scheduled_for_telechat")
+    prev_returning = bool(prev and prev.returning_item)
+    prev_telechat = prev.telechat_date if prev else None
+    prev_agenda = bool(prev_telechat)
+    
+    returning_item_changed = bool(new_returning_item != None and new_returning_item != prev_returning)
+
+    if new_returning_item == None:
+        returning = prev_returning
+    else:
+        returning = new_returning_item
+
+    if returning == prev_returning and new_telechat_date == prev_telechat:
+        # fully updated, nothing to do
+        return
+
+    # auto-update returning item
+    if (not returning_item_changed and on_agenda and prev_agenda
+        and new_telechat_date != prev_telechat):
+        returning = True
+
+    e = Telechat()
+    e.type = "scheduled_for_telechat"
+    e.by = by
+    e.doc = doc
+    e.returning_item = returning
+    e.telechat_date = new_telechat_date
+    
+    if on_agenda != prev_agenda:
+        if on_agenda:
+            e.desc = "Placed on agenda for telechat - %s by %s" % (
+                new_telechat_date, by.get_name())
+        else:
+            e.desc = "Removed from agenda for telechat by %s" % by.get_name()
+    elif on_agenda and new_telechat_date != prev_telechat:
+        e.desc = "Telechat date has been changed to <b>%s</b> from <b>%s</b> by %s" % (
+            new_telechat_date, prev_telechat, by.get_name())
+    else:
+        # we didn't reschedule but flipped returning item bit - let's
+        # just explain that
+        if returning:
+            e.desc = "Added as returning item on telechat by %s" % by.get_name()
+        else:
+            e.desc = "Removed as returning item on telechat by %s" % by.get_name()
+
+    e.save()
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    update_telechat = update_telechatREDESIGN

ietf/idrfc/utils.py

@@ -152,7 +152,7 @@ def _get_history(doc, versions):
     if settings.USE_DB_REDESIGN_PROXY_CLASSES:
         versions = [] # clear versions
         event_holder = doc._draft if hasattr(doc, "_draft") else doc._rfcindex
-        for e in event_holder.event_set.all().select_related('by').order_by('-time', '-id'):
+        for e in event_holder.event_set.all().select_related('by').order_by('-time', 'id'):
             info = {}
             if e.type == "new_revision":
                 filename = u"%s-%s" % (e.doc.name, e.newrevision.rev)

ietf/idrfc/views_doc.py

@@ -22,8 +22,8 @@
 from ietf.idrfc.utils import *
 from ietf.idrfc.lastcall import request_last_call
 
-from doc.models import Document, Event, save_document_in_history, DocHistory
-from name.models import IesgDocStateName, get_next_iesg_states
+from doc.models import Document, Event, Status, Telechat, save_document_in_history, DocHistory
+from name.models import IesgDocStateName, IntendedStdLevelName, DocInfoTagName, get_next_iesg_states
 
 class ChangeStateForm(forms.Form):
     state = forms.ModelChoiceField(IDState.objects.all(), empty_label=None, required=True)
@@ -90,7 +90,7 @@ def change_stateREDESIGN(request, name):
     """Change state of Internet Draft, notifying parties as necessary
     and logging the change as a comment."""
     doc = get_object_or_404(Document, docalias__name=name)
-    if not doc.latest_event(type="started_iesg_process") or doc.state_id == "expired":
+    if (not doc.latest_event(type="started_iesg_process")) or doc.state_id == "expired":
         raise Http404()
 
     login = request.user.get_profile().email()
@@ -379,6 +379,234 @@ def diff(obj, attr, name):
                                    login=login),
                               context_instance=RequestContext(request))
 
+class NameFromEmailModelChoiceField(forms.ModelChoiceField):
+    def label_from_instance(self, obj):
+        return obj.get_name()
+
+class EditInfoFormREDESIGN(forms.Form):
+    intended_std_level = forms.ModelChoiceField(IntendedStdLevelName.objects.all(), empty_label=None, required=True)
+    status_date = forms.DateField(required=False, help_text="Format is YYYY-MM-DD")
+    via_rfc_editor = forms.BooleanField(required=False, label="Via IRTF or RFC Editor")
+    ad = NameFromEmailModelChoiceField(Email.objects.filter(role__name__in=("ad", "ex-ad")).order_by('role__name', 'person__name'), label="Responsible AD", empty_label=None, required=True)
+    notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas", required=False)
+    note = forms.CharField(widget=forms.Textarea, label="IESG note", required=False)
+    telechat_date = forms.TypedChoiceField(coerce=lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), empty_value=None, required=False)
+    returning_item = forms.BooleanField(required=False)
+
+    def __init__(self, *args, **kwargs):
+        old_ads = kwargs.pop('old_ads')
+        
+        super(self.__class__, self).__init__(*args, **kwargs)
+
+        # fix up ad field
+        choices = self.fields['ad'].choices
+        ex_ads = dict((e.pk, e) for e in Email.objects.filter(role__name="ex-ad"))
+        if old_ads:
+            # separate active ADs from inactive
+            for i, t in enumerate(choices):
+                if t[0] in ex_ads:
+                    choices.insert(i, ("", "----------------"))
+                    break
+        else:
+            # remove old ones
+            self.fields['ad'].choices = [t for t in choices if t[0] not in ex_ads]
+        
+        # telechat choices
+        dates = TelechatDates.objects.all()[0].dates()
+        init = kwargs['initial']['telechat_date']
+        if init and init not in dates:
+            dates.insert(0, init)
+
+        choices = [("", "(not on agenda)")]
+        for d in dates:
+            choices.append((d, d.strftime("%Y-%m-%d")))
+
+        self.fields['telechat_date'].choices = choices
+
+        # returning item is rendered non-standard
+        self.standard_fields = [x for x in self.visible_fields() if x.name not in ('returning_item',)]
+
+    def clean_status_date(self):
+        d = self.cleaned_data['status_date']
+        if d:
+            if d < date.today():
+                raise forms.ValidationError("Date must not be in the past.")
+            if d >= date.today() + timedelta(days=365 * 2):
+                raise forms.ValidationError("Date must be within two years.")
+        
+        return d
+
+    def clean_note(self):
+        # note is stored munged in the database
+        return self.cleaned_data['note'].replace('\n', '<br>').replace('\r', '').replace('  ', '&nbsp; ')
+
+
+def get_initial_notify(doc):
+    # set change state notice to something sensible
+    receivers = []
+    if doc.group.type_id == "individ":
+        for a in doc.authors.all():
+            receivers.append(e.address)
+    else:
+        receivers.append("%s-chairs@%s" % (doc.group.acronym, settings.TOOLS_SERVER))
+        for editor in Email.objects.filter(role__name="wgeditor", role__group=doc.group):
+            receivers.append(e.address)
+
+    receivers.append("%s@%s" % (doc.name, settings.TOOLS_SERVER))
+    return ", ".join(receivers)
+
+@group_required('Area_Director','Secretariat')
+def edit_infoREDESIGN(request, name):
+    """Edit various Internet Draft attributes, notifying parties as
+    necessary and logging changes as document events."""
+    doc = get_object_or_404(Document, name=name)
+    if doc.state_id == "expired":
+        raise Http404()
+
+    login = request.user.get_profile().email()
+
+    new_document = False
+    if not doc.iesg_state: # FIXME: should probably get this as argument to view
+        new_document = True
+        doc.iesg_state = IesgDocStateName.objects.get(slug="pub-req")
+        doc.notify = get_initial_notify(doc)
+
+    e = doc.latest_event(Telechat, type="scheduled_for_telechat")
+    initial_telechat_date = e.telechat_date if e else None
+    initial_returning_item = bool(e and e.returning_item)
+
+    if request.method == 'POST':
+        form = EditInfoForm(request.POST,
+                            old_ads=False,
+                            initial=dict(telechat_date=initial_telechat_date))
+        if form.is_valid():
+            save_document_in_history(doc)
+            
+            r = form.cleaned_data
+            if new_document:
+                # fix so Django doesn't barf in the diff below because these
+                # fields can't be NULL
+                doc.ad = r['ad']
+                
+                replaces = Document.objects.filter(docalias__relateddocument__source=doc, docalias__relateddocument__relationship="replaces")
+                if replaces:
+                    # this should perhaps be somewhere else, e.g. the
+                    # place where the replace relationship is established
+                    e = Event()
+                    e.type = "added_comment"
+                    e.by = Email.objects.get(address="(System)")
+                    e.doc = doc
+                    e.desc = "Earlier history may be found in the Comment Log for <a href=\"%s\">%s</a>" % (replaces[0], replaces[0].get_absolute_url())
+                    e.save()
+
+                e = Event()
+                e.type = "started_iesg_process"
+                e.by = login
+                e.doc = doc
+                e.desc = "IESG process started in state <b>%s</b>" % doc.iesg_state.name
+                e.save()
+                    
+            orig_ad = doc.ad
+
+            changes = []
+
+            def desc(attr, new, old):
+                entry = "%(attr)s has been changed to <b>%(new)s</b> from <b>%(old)s</b>"
+                if new_document:
+                    entry = "%(attr)s has been changed to <b>%(new)s</b>"
+                
+                return entry % dict(attr=attr, new=new, old=old)
+            
+            def diff(attr, name):
+                v = getattr(doc, attr)
+                if r[attr] != v:
+                    changes.append(desc(name, r[attr], v))
+                    setattr(doc, attr, r[attr])
+
+            # update the attributes, keeping track of what we're doing
+            diff('intended_std_level', "Intended Status")
+            diff('ad', "Responsible AD")
+            diff('notify', "State Change Notice email list")
+
+            if r['note'] != doc.note:
+                if not r['note']:
+                    if doc.note:
+                        changes.append("Note field has been cleared")
+                else:
+                    if doc.note:
+                        changes.append("Note changed to '%s'" % r['note'])
+                    else:
+                        changes.append("Note added '%s'" % r['note'])
+                    
+                doc.note = r['note']
+
+            for c in changes:
+                e = Event()
+                e.type = "changed_document"
+                e.by = login
+                e.doc = doc
+                e.desc = c + " by %s" % login.get_name()
+                e.save()
+
+            update_telechat(request, doc, login,
+                            r['telechat_date'], r['returning_item'])
+
+            e = doc.latest_event(Status, type="changed_status_date")
+            status_date = e.date if e else None
+            if r["status_date"] != status_date:
+                e = Status()
+                e.type ="changed_status_date"
+                e.by = login
+                e.doc = doc
+                d = desc("Status date", r["status_date"], status_date)
+                changes.append(d)
+                e.desc = d + " by %s" % login.get_name()
+                e.date = r["status_date"]
+                e.save()
+            
+            if in_group(request.user, 'Secretariat'):
+                via_rfc = DocInfoTagName.objects.get(slug="via-rfc")
+                if r['via_rfc_editor']:
+                    doc.tags.add(via_rfc)
+                else:
+                    doc.tags.remove(via_rfc)
+
+            doc.time = datetime.datetime.now()
+
+            if changes and not new_document:
+                email_owner(request, doc, orig_ad, login, "\n".join(changes))
+                
+            doc.save()
+            return HttpResponseRedirect(doc.get_absolute_url())
+    else:
+        e = doc.latest_event(Status)
+        status = e.date if e else None
+        init = dict(intended_std_level=doc.intended_std_level,
+                    status_date=status,
+                    ad=doc.ad,
+                    notify=doc.notify,
+                    note=dehtmlify_textarea_text(doc.note),
+                    telechat_date=initial_telechat_date,
+                    returning_item=initial_returning_item,
+                    )
+
+        form = EditInfoForm(old_ads=False, initial=init)
+
+    if not in_group(request.user, 'Secretariat'):
+        # filter out Via RFC Editor
+        form.standard_fields = [x for x in form.standard_fields if x.name != "via_rfc_editor"]
+        
+    return render_to_response('idrfc/edit_infoREDESIGN.html',
+                              dict(doc=doc,
+                                   form=form,
+                                   user=request.user,
+                                   login=login),
+                              context_instance=RequestContext(request))
+
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    EditInfoForm = EditInfoFormREDESIGN
+    edit_info = edit_infoREDESIGN
+
 
 @group_required('Area_Director','Secretariat')
 def request_resurrect(request, name):

ietf/idrfc/views_edit.py

@@ -0,0 +1,47 @@
+{% extends "base.html" %}
+
+{% block title %}Edit info on {{ doc }}{% endblock %}
+
+{% block morecss %}
+form.edit-info #id_state_change_notice_to {
+  width: 600px;
+}
+form.edit-info #id_note {
+  width: 600px;
+  height: 150px;
+}
+form.edit-info .actions {
+  padding-top: 20px;
+}
+{% endblock %}
+
+{% block content %}
+{% load ietf_filters %}
+<h1>Edit info on {{ doc }}</h1>
+
+<form class="edit-info" action="" method="POST">
+  <table>
+    {% for field in form.standard_fields %}
+    <tr>
+      <th>{{ field.label_tag }}:</th>
+      <td>{{ field }}
+      {% ifequal field.name "telechat_date" %}{{ form.returning_item }} {{ form.returning_item.label_tag }} {{ form.returning_item.errors }}{% endifequal %}
+      {% ifequal field.name "ad" %}
+      {% if user|in_group:"Area_Director" %}
+      <label><input type="checkbox" name="ad" value="{{ login.pk }}" /> Assign to me</label>
+      {% endif %}
+      {% endifequal %}      
+      {% if field.help_text %}<div class="help">{{ field.help_text }}</div>{% endif %}
+      {{ field.errors }}</td>
+    </tr>
+    {% endfor %}
+    <tr>
+      <td></td>
+      <td class="actions">
+        <a href="{{ doc.get_absolute_url }}">Back</a>
+        <input type="submit" value="Save"/>
+      </td>
+    </tr>
+  </table>
+</form>
+{% endblock %}