Bug fixes, changes based on feedback from RjS. Abandon, recharter and initial charter views. Forward snapshots for abandoned efforts.

 - Legacy-Id: 3421

Author: Martin Qvist

ietf/idrfc/views_edit.py

@@ -154,75 +154,6 @@ def change_stateREDESIGN(request, name):
 def dehtmlify_textarea_text(s):
     return s.replace("<br>", "\n").replace("<b>", "").replace("</b>", "").replace("  ", " ")
 
-class EditInfoForm(forms.Form):
-    intended_status = forms.ModelChoiceField(IDIntendedStatus.objects.all(), empty_label=None, required=True)
-    status_date = forms.DateField(required=False, help_text="Format is YYYY-MM-DD")
-    area_acronym = forms.ModelChoiceField(Area.active_areas(), required=True, empty_label='None Selected')
-    via_rfc_editor = forms.BooleanField(required=False, label="Via IRTF or RFC Editor")
-    job_owner = forms.ModelChoiceField(IESGLogin.objects.filter(user_level__in=(IESGLogin.AD_LEVEL, IESGLogin.INACTIVE_AD_LEVEL)).order_by('user_level', 'last_name'), label="Responsible AD", empty_label=None, required=True)
-    create_in_state = forms.ModelChoiceField(IDState.objects.filter(document_state_id__in=(IDState.PUBLICATION_REQUESTED, IDState.AD_WATCHING)), empty_label=None, required=True)
-    state_change_notice_to = 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)
-
-        job_owners = IESGLogin.objects.in_bulk([t[0] for t in self.fields['job_owner'].choices])
-        choices = [("","None Selected"), ]
-        if old_ads:
-            # separate active ADs from inactive
-            separated = False
-            for t in self.fields['job_owner'].choices:
-                if job_owners[t[0]].user_level != IESGLogin.AD_LEVEL and not separated:
-                    choices.append(("", "----------------"))
-                    separated = True
-                choices.append(t)
-            self.fields['job_owner'].choices = choices
-        else:
-            # remove old ones
-            for t in self.fields['job_owner'].choices:
-               if job_owners[t[0]].user_level==IESGLogin.AD_LEVEL:
-                 choices.append(t)
-            self.fields['job_owner'].choices = choices
-        
-        # 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
-
-#        if kwargs['initial']['area_acronym'] == Acronym.INDIVIDUAL_SUBMITTER:
-#            # default to "gen"
-#            kwargs['initial']['area_acronym'] = 1008
-        
-        # 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_state_change_notice(doc):
     # set change state notice to something sensible
     receivers = []
@@ -245,167 +176,25 @@ def get_initial_state_change_notice(doc):
 def get_new_ballot_id():
     return IDInternal.objects.aggregate(Max('ballot'))['ballot__max'] + 1
 
-@group_required('Area_Director','Secretariat')
-def edit_info(request, name):
-    """Edit various Internet Draft attributes, notifying parties as
-    necessary and logging changes as document comments."""
-    doc = get_object_or_404(InternetDraft, filename=name)
-    if doc.status.status == "Expired":
-        raise Http404()
-
-    login = IESGLogin.objects.get(login_name=request.user.username)
-
-    new_document = False
-    if not doc.idinternal:
-        new_document = True
-        doc.idinternal = IDInternal(draft=doc,
-                                    rfc_flag=type(doc) == Rfc,
-                                    cur_state_id=IDState.PUBLICATION_REQUESTED,
-                                    prev_state_id=IDState.PUBLICATION_REQUESTED,
-                                    state_change_notice_to=get_initial_state_change_notice(doc),
-                                    primary_flag=1,
-                                    area_acronym_id=Acronym.INDIVIDUAL_SUBMITTER,
-                                    # would be better to use NULL to
-                                    # signify an empty ballot
-                                    ballot_id=get_new_ballot_id(),
-                                    via_rfc_editor = False,
-                                    )
-
-    if doc.idinternal.agenda:
-        initial_telechat_date = doc.idinternal.telechat_date
-    else:
-        initial_telechat_date = None
-
-    if request.method == 'POST':
-        form = EditInfoForm(request.POST,
-                            old_ads=False,
-                            initial=dict(telechat_date=initial_telechat_date,
-                                         area_acronym=doc.idinternal.area_acronym_id))
-        if form.is_valid():
-            changes = []
-            r = form.cleaned_data
-            entry = "%s has been changed to <b>%s</b> from <b>%s</b>"
-            if new_document:
-                doc.idinternal.cur_state_id=r['create_in_state'].document_state_id
-                doc.idinternal.prev_state_id=r['create_in_state'].document_state_id
-                # Django barfs in the diff below because these fields
-                # can't be NULL
-                doc.idinternal.job_owner = r['job_owner']
-                if 'area_acronym' in r:
-                    doc.idinternal.area_acronym = r['area_acronym']
-                
-                replaces = doc.replaces_set.all()
-                if replaces and replaces[0].idinternal:
-                    c = "Earlier history may be found in the Comment Log for <a href=\"%s\">%s</a>" % (replaces[0], replaces[0].idinternal.get_absolute_url())
-                    add_document_comment(request, doc, c)
-                    
-            orig_job_owner = doc.idinternal.job_owner
-
-            # update the attributes, keeping track of what we're doing
-
-            # coalesce some of the changes into one comment, mail them below
-            def diff(obj, attr, name):
-                v = getattr(obj, attr)
-                if r[attr] != v:
-                    changes.append(entry % (name, r[attr], v))
-                    setattr(obj, attr, r[attr])
-
-            diff(doc, 'intended_status', "Intended Status")
-            diff(doc.idinternal, 'status_date', "Status date")
-            if 'area_acronym' in r and r['area_acronym']:
-                diff(doc.idinternal, 'area_acronym', 'Area acronym')
-            diff(doc.idinternal, 'job_owner', 'Responsible AD')
-            diff(doc.idinternal, 'state_change_notice_to', "State Change Notice email list")
-
-            if changes and not new_document:
-                add_document_comment(request, doc, "<br>".join(changes))
-
-            # handle note (for some reason the old Perl code didn't
-            # include that in the changes)
-            if r['note'] != doc.idinternal.note:
-                if not r['note']:
-                    if doc.idinternal.note:
-                        add_document_comment(request, doc, "Note field has been cleared")
-                else:
-                    if doc.idinternal.note:
-                        add_document_comment(request, doc, "[Note]: changed to '%s'" % r['note'])
-                    else:
-                        add_document_comment(request, doc, "[Note]: '%s' added" % r['note'])
-                    
-                doc.idinternal.note = r['note']
-
-            update_telechat(request, doc.idinternal,
-                            r['telechat_date'], r['returning_item'])
-
-            if in_group(request.user, 'Secretariat'):
-                doc.idinternal.via_rfc_editor = bool(r['via_rfc_editor'])
-
-            doc.idinternal.email_display = str(doc.idinternal.job_owner)
-            doc.idinternal.token_name = str(doc.idinternal.job_owner)
-            doc.idinternal.token_email = doc.idinternal.job_owner.person.email()[1]
-            doc.idinternal.mark_by = login
-            doc.idinternal.event_date = date.today()
-
-            if changes and not new_document:
-                email_owner(request, doc, orig_job_owner, login, "\n".join(changes))
-            if new_document:
-                add_document_comment(request, doc, "Draft added in state %s" % doc.idinternal.cur_state.state)
-                
-            doc.idinternal.save()
-            doc.save()
-            return HttpResponseRedirect(doc.idinternal.get_absolute_url())
-    else:
-        init = dict(intended_status=doc.intended_status_id,
-                    status_date=doc.idinternal.status_date,
-                    area_acronym=doc.idinternal.area_acronym_id,
-                    job_owner=doc.idinternal.job_owner_id,
-                    state_change_notice_to=doc.idinternal.state_change_notice_to,
-                    note=dehtmlify_textarea_text(doc.idinternal.note),
-                    telechat_date=initial_telechat_date,
-                    returning_item=doc.idinternal.returning_item,
-                    )
-
-        form = EditInfoForm(old_ads=False, initial=init)
-
-    if not in_group(request.user, 'Secretariat'):
-        form.standard_fields = [x for x in form.standard_fields if x.name != "via_rfc_editor"]
-
-        
-    return render_to_response('idrfc/edit_info.html',
-                              dict(doc=doc,
-                                   form=form,
-                                   user=request.user,
-                                   login=login),
-                              context_instance=RequestContext(request))
-
 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 = forms.ModelChoiceField(Person.objects.filter(email__role__name__in=("ad", "ex-ad")).order_by('email__role__name', 'name'), label="Responsible AD", empty_label=None, required=True)
+    ad = forms.ModelChoiceField(Person.objects.filter(email__role__name="ad", email__role__group__state="active").order_by('name'), label="Responsible AD", empty_label=None, required=True)
     create_in_state = forms.ModelChoiceField(IesgDocStateName.objects.filter(slug__in=("pub-req", "watching")), 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
+        # if previous AD is now ex-AD, append that person to the list
+        ad_pk = self.initial.get('ad')
         choices = self.fields['ad'].choices
-        ex_ads = dict((e.pk, e) for e in Person.objects.filter(email__role__name="ex-ad").distinct())
-        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]
+        if ad_pk and ad_pk not in [pk for pk, name in choices]:
+            self.fields['ad'].choices = list(choices) + [("", "-------"), (ad_pk, Person.objects.get(pk=ad_pk).name)]
 
         # telechat choices
         dates = TelechatDates.objects.all()[0].dates()
@@ -473,8 +262,8 @@ def edit_infoREDESIGN(request, name):
 
     if request.method == 'POST':
         form = EditInfoForm(request.POST,
-                            old_ads=False,
-                            initial=dict(telechat_date=initial_telechat_date))
+                            initial=dict(ad=doc.ad_id,
+                                         telechat_date=initial_telechat_date))
         if form.is_valid():
             save_document_in_history(doc)
 
@@ -539,6 +328,7 @@ def diff(attr, name):
 
             for c in changes:
                 e = DocEvent(doc=doc, by=login)
+                e.desc = c
                 e.type = "changed_document"
                 e.save()
 
@@ -550,8 +340,8 @@ def diff(attr, name):
             if r["status_date"] != status_date:
                 e = StatusDateDocEvent(doc=doc, by=login)
                 e.type ="changed_status_date"
-                d = desc("Status date", r["status_date"], status_date)
-                changes.append(d)
+                e.desc = desc("Status date", r["status_date"], status_date)
+                changes.append(e.desc)
                 e.date = r["status_date"]
                 e.save()
 
@@ -572,16 +362,16 @@ def diff(attr, name):
     else:
         e = doc.latest_event(StatusDateDocEvent)
         status = e.date if e else None
-        init = dict(intended_std_level=doc.intended_std_level,
+        init = dict(intended_std_level=doc.intended_std_level_id,
                     status_date=status,
-                    ad=doc.ad,
+                    ad=doc.ad_id,
                     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)
+        form = EditInfoForm(initial=init)
 
     if not has_role(request.user, 'Secretariat'):
         # filter out Via RFC Editor

ietf/templates/wgrecord/change_state.html

@@ -1,6 +1,20 @@
 {% extends "base.html" %}
 
-{% block title %}Change state of WG {{ wg.acronym }}{% endblock %}
+{% block title %}
+{% ifequal option "initcharter" %}
+Initiate chartering of WG {{ wg.acronym }}
+{% else %}
+{% ifequal option "recharter" %}
+Recharter WG {{ wg.acronym }}
+{% else %}
+{% ifequal option "abandon" %}
+Abandon effort on WG {{ wg.acronym }}
+{% else %}
+Change state of WG {{ wg.acronym }}
+{% endifequal %}
+{% endifequal %}
+{% endifequal %}
+{% endblock %}
 
 {% block morecss %}
 form.change-state select {
@@ -19,22 +33,49 @@
 {% endblock %}
 
 {% block content %}
-<h1>Change state of {{ wg.acronym }}</h1>
+<h1>{% ifequal option "initcharter" %}
+Initiate chartering of WG {{ wg.acronym }}
+{% else %}
+{% ifequal option "recharter" %}
+Recharter WG {{ wg.acronym }}
+{% else %}
+{% ifequal option "abandon" %}
+Abandon effort on WG {{ wg.acronym }}
+{% else %}
+Change state of WG {{ wg.acronym }}
+{% endifequal %}
+{% endifequal %}
+{% endifequal %}
+</h1>
 
-<p class="helptext">For help on the states, see the <a href="{% url help_charter_states %}">state table</a>.</p>
+{% ifnotequal option "initcharter" %}{% ifnotequal option "recharter" %}{% ifnotequal option "abandon" %}<p class="helptext">For help on the states, see the <a href="{% url help_charter_states %}">state table</a>.</p>{% endifnotequal %}{% endifnotequal %}{% endifnotequal %}
 
 <form class="change-state" action="" method="post">
   <table>
     {% for field in form.visible_fields %}
     <tr>
-      <th>{{ field.label_tag }}:</th>
-      <td>{{ field }}
+      {% ifequal field.name "initial_time" %}
+        {% ifequal option "recharter" %}
+        <th>{{ field.label_tag }}:</th>
+        <td>{{ field }}
+        {% if field.help_text %}<div class="help">{{ field.help_text }}</div>{% endif %}
+        {% else %}
+        {% ifequal option "initcharter" %}
+        <th>{{ field.label_tag }}:</th>
+        <td>{{ field }}
+        {% if field.help_text %}<div class="help">{{ field.help_text }}</div>{% endif %}
+        {% endifequal %}
+        {% endifequal %}
+      {% else %}
+        <th>{{ field.label_tag }}:</th>
+        <td>{{ field }}
+        {% if field.help_text %}<div class="help">{{ field.help_text }}</div>{% endif %}
+      {% endifequal %}      
       {% ifequal field.name "charter_state" %}
 	{% ifequal field.errors "warning" %}
-        <ul><li>The initial review time hasn't elapsed. Proceed anyway? <label><input type="checkbox" name="confirm_state" /></label></li></ul>
+        <ul><li>The initial review time hasn't elapsed. Select this checkbox to proceed anyway: <label><input type="checkbox" name="confirm_state" /></label></li></ul>
 	{% endifequal %}
       {% endifequal %}      
-      {% if field.help_text %}<div class="help">{{ field.help_text }}</div>{% endif %}
 	{% ifnotequal field.name "charter_state" %}
         {{ field.errors }}
 	{% endifnotequal %}
@@ -43,8 +84,12 @@ <h1>Change state of {{ wg.acronym }}</h1>
     {% endfor %}
     <tr>
       <td colspan="2" class="actions">
+        {% if option %}
+        <input type="submit" value="Submit"/>
+        {% else %}
         <a href="{% url wg_view_record name=wg.acronym %}">Back</a>
         <input type="submit" value="Save"/>
+        {% endif %}
       </td>
     </tr>
   </table>