Merged [4999] from jmh@joelhalpern.com:

Correct test of final shepherd update flag.
 - Legacy-Id: 5014
Note: SVN reference [4999] has been migrated to Git commit aba18e8

Author: levkowetz

debug.py

@@ -5,11 +5,13 @@
     import syslog
     write = syslog.syslog
 except ImportError:                     # import syslog will fail on Windows boxes
-    pass
-import sys
-write = lambda x: sys.stderr.write(x+"\n")
-    
-from pprint import pformat
+    import sys
+    write = lambda x: sys.stderr.write(x+"\n")
+try:
+    from pprint import pformat
+except ImportError:
+    pformat = lambda x: x
+
 import cProfile
 try:
     from django.conf import settings

ietf/idrfc/views_ballot.py

@@ -519,14 +519,6 @@ class Meta:
     def clean_ballot_writeup(self):
         return self.cleaned_data["ballot_writeup"].replace("\r", "")
 
-class ApprovalTextForm(forms.ModelForm):
-    class Meta:
-        model = BallotInfo
-        fields = ["approval_text"]
-
-    def clean_approval_text(self):
-        return self.cleaned_data["approval_text"].replace("\r", "")
-
 @group_required('Area_Director','Secretariat')
 def lastcalltext(request, name):
     """Editing of the last call text"""
@@ -848,64 +840,15 @@ def ballot_writeupnotesREDESIGN(request, name):
     ballot_writeupnotes = ballot_writeupnotesREDESIGN
 
 
-@group_required('Area_Director','Secretariat')
-def ballot_approvaltext(request, name):
-    """Editing of approval text"""
-    doc = get_object_or_404(InternetDraft, filename=name)
-    if not doc.idinternal:
-        raise Http404()
-
-    login = IESGLogin.objects.get(login_name=request.user.username)
-
-    try:
-        ballot = doc.idinternal.ballot
-    except BallotInfo.DoesNotExist:
-        ballot = generate_ballot(request, doc)
-
-    approval_text_form = ApprovalTextForm(instance=ballot)
-
-    if request.method == 'POST':
-
-        if "save_approval_text" in request.POST:
-            approval_text_form = ApprovalTextForm(request.POST, instance=ballot)            
-            if approval_text_form.is_valid():
-                ballot.approval_text = approval_text_form.cleaned_data["approval_text"]
-		add_document_comment(request, doc, "Approval announcement text changed")
-                ballot.save()
-                
-        if "regenerate_approval_text" in request.POST:
-            ballot.approval_text = generate_approval_mail(request, doc)
-	    add_document_comment(request, doc, "Approval announcement text regenerated")
-            ballot.save()
-
-            # make sure form has the updated text
-            approval_text_form = ApprovalTextForm(instance=ballot)
-            
-        doc.idinternal.event_date = date.today()
-        doc.idinternal.save()
-
-    can_announce = doc.idinternal.cur_state_id > 19
-    docs_with_invalid_status = [d.document().file_tag() for d in doc.idinternal.ballot_set() if "None" in d.document().intended_status.intended_status or "Request" in d.document().intended_status.intended_status]
-    need_intended_status = ", ".join(docs_with_invalid_status)
-
-    return render_to_response('idrfc/ballot_approvaltext.html',
-                              dict(doc=doc,
-                                   back_url=doc.idinternal.get_absolute_url(),
-                                   ballot=ballot,
-                                   approval_text_form=approval_text_form,
-                                   can_announce=can_announce,
-                                   need_intended_status=need_intended_status,
-                                   ),
-                              context_instance=RequestContext(request))
 
-class ApprovalTextFormREDESIGN(forms.Form):
+class ApprovalTextForm(forms.Form):
     approval_text = forms.CharField(widget=forms.Textarea, required=True)
 
     def clean_approval_text(self):
         return self.cleaned_data["approval_text"].replace("\r", "")
 
 @group_required('Area_Director','Secretariat')
-def ballot_approvaltextREDESIGN(request, name):
+def ballot_approvaltext(request, name):
     """Editing of approval text"""
     doc = get_object_or_404(Document, docalias__name=name)
     if not doc.get_state("draft-iesg"):
@@ -936,7 +879,7 @@ def ballot_approvaltextREDESIGN(request, name):
             e = generate_approval_mail(request, doc)
 
             # make sure form has the updated text
-            form = ApprovalTextForm(initial=dict(approval_text=existing.text))
+            form = ApprovalTextForm(initial=dict(approval_text=e.text))
 
     can_announce = doc.get_state("draft-iesg").order > 19
     need_intended_status = ""
@@ -952,9 +895,6 @@ def ballot_approvaltextREDESIGN(request, name):
                                    ),
                               context_instance=RequestContext(request))
 
-if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-    ApprovalTextForm = ApprovalTextFormREDESIGN
-    ballot_approvaltext = ballot_approvaltextREDESIGN
 
 @group_required('Secretariat')
 def approve_ballot(request, name):

ietf/meeting/views.py

@@ -21,6 +21,7 @@
 from django.db.models import Max
 
 import debug
+import urllib
 
 from ietf.idtracker.models import InternetDraft
 from ietf.utils.pipe import pipe
@@ -427,22 +428,33 @@ def ical_agenda(request, num=None):
     q = request.META.get('QUERY_STRING','') or ""
     filter = q.lower().replace('%2c',',').split(',');
     include = set(filter)
-    include_types = ["Plenary","Other"]
+    include_types = set(["Plenary","Other"])
     exclude = []
 
     # Process the special flags.
+    #   "-wgname" will remove a working group from the output.
+    #   "~Type" will add that type to the output. 
+    #   "-~Type" will remove that type from the output
+    # Current types are:
+    #   Session, Other (default on), Break, Plenary (default on)
+    # Non-Working Group "wg names" include:
+    #   edu, ietf, tools, iesg, iab
+
     for item in include:
         if item:
-            if item[0] == '-':
+            if item[0] == '-' and item[1] == '~':
+                include_types -= set([item[2:3].upper()+item[3:]])
+            elif item[0] == '-':
                 exclude.append(item[1:])
-            if item[0] == '~':
-                include_types.append(item[1:2].upper()+item[2:])
+            elif item[0] == '~':
+                include_types |= set([item[1:2].upper()+item[2:]])
 
     timeslots = TimeSlot.objects.filter(Q(meeting__id = meeting.id),
         Q(type__name__in = include_types) |
         Q(session__group__acronym__in = filter) |
         Q(session__group__parent__acronym__in = filter)
-        )#.exclude(Q(session__group__isnull = False),
+        ).exclude(Q(session__group__acronym__in = exclude))
+        #.exclude(Q(session__group__isnull = False),
         #Q(session__group__acronym__in = exclude) | 
         #Q(session__group__parent__acronym__in = exclude))
 

ietf/submit/forms.py

@@ -12,6 +12,8 @@
 from django.utils.html import mark_safe
 from django.core.urlresolvers import reverse as urlreverse
 
+import debug
+
 from ietf.idtracker.models import InternetDraft, IETFWG
 from ietf.proceedings.models import Meeting
 from ietf.submit.models import IdSubmissionDetail, TempIdAuthors, Preapproval
@@ -204,6 +206,7 @@ def get_draft(self):
         txt_file.seek(0)
         return self.draft
 
+    @debug.trace
     def save(self):
         for ext in ['txt', 'pdf', 'xml', 'ps']:
             fd = self.cleaned_data[ext]
@@ -334,11 +337,13 @@ def get_author_buttons(self):
                                               'full_name': full_name})
         return ''.join(buttons)
 
+    @debug.trace
     def save(self, request):
         self.save_submitter_info()
         self.save_new_draft_info()
         self.send_confirmation_mail(request)
 
+    @debug.trace
     def send_confirmation_mail(self, request):
         subject = 'Confirmation for Auto-Post of I-D %s' % self.draft.filename
         from_email = settings.IDSUBMIT_FROM_EMAIL
@@ -526,10 +531,12 @@ def save_new_draft_info(self):
                     author_order=i + 1,
                     submission=draft)
 
+    @debug.trace
     def save(self, request):
         self.save_new_draft_info()
         self.send_mail_to_secretariat(request)
 
+    @debug.trace
     def send_mail_to_secretariat(self, request):
         subject = 'Manual Post Requested for %s' % self.draft.filename
         from_email = settings.IDSUBMIT_FROM_EMAIL

ietf/templates/idrfc/ballot_writeups.html

@@ -58,7 +58,7 @@
 {% else %}
 {% if stream_info.stream.name == 'ISE' or stream_info.stream.name == 'IRTF' %}
 {% if user|in_group:"Secretariat" and not info.conflict_reviews %}
-<span id="doc_conflict_review_button" class="yui-button yui-link-button" style="margin-left:2px;">{% url conflict_review_start name=doc.draft_name as start_review_url %}{% if start_review_url %}<span class="first-child"><a href="{{start_review_url}}">Begin IETF Conflict Review</a></span>{% endif %}</span>
+<span id="doc_conflict_review_button" class="yui-button yui-link-button" style="margin-left:2px;">{% url conflict_review_start name=doc.draft_name as start_review_url %}{% if start_review_url %}<span class="first-child"><a href="{{start_review_url}}">Begin IETF Conflict Review {% if not doc.underlying_document.intended_std_level %}(note that intended status is not set){% endif %}</a></span>{% endif %}</span>
 {% endif %}
 {% else %}
  {% if stream_info.stream.name == 'IETF'%}{%if not doc.in_ietf_process %}

ietf/templates/idrfc/doc_tab_document.html

@@ -58,7 +58,7 @@
 <tr><td>Intended RFC status:</td><td>
 {% with user|in_group:"Area_Director,Secretariat" as add_link %}
 {% if add_link %}<a class="editlink" href="{% url doc_change_intended_status name=doc.draft_name %}">{% endif %}
-{{ doc.underlying_document.intended_std_level|default:"-"  }}
+{{ doc.underlying_document.intended_std_level|default:"(None)"  }}
 {% if add_link %}</a>{% endif %}
 {% endwith %}
 </td></tr> 
@@ -142,7 +142,7 @@
 <tr><td>Responsible AD:</td><td>
 {% with user|in_group:"Area_Director,Secretariat" as add_link %}
 {% if add_link %}<a class="editlink" href="{% url doc_change_ad name=doc.draft_name %}">{% endif %}
-{% if doc.in_ietf_process %}{{ doc.ietf_process.ad_name|default:"-"|escape }}{%else%}-{%endif%}
+{% if doc.in_ietf_process %}{{ doc.ietf_process.ad_name|default:"(None)"|escape }}{%else%}(None){%endif%}
 {% if add_link %}</a>{% endif %}
 {% endwith %}
 </td></tr>