Secretariat can edit position of Area Directors

OleLaursen · OleLaursen · commit 700db3964414 · 2010-05-25T19:16:37.000Z
- Legacy-Id: 2287
diff --git a/branch/iesg-tracker/ietf/idrfc/idrfc_wrapper.py b/branch/iesg-tracker/ietf/idrfc/idrfc_wrapper.py
@@ -625,13 +625,16 @@ def _init(self):
                                   'comment_date':c.date,
                                   'comment_revision':str(c.revision),
                                   'ad_name':str(c.ad),
+                                  'ad_username': c.ad.login_name,
                                   'position':'No Record',
                                   'is_old_ad':False})
                 ads.add(str(c.ad))
         if self.ballot_active:
             for ad in IESGLogin.active_iesg():
                 if str(ad) not in ads:
-                    positions.append({"ad_name":str(ad), "position":"No Record"})
+                    positions.append(dict(ad_name=str(ad),
+                                          ad_username=ad.login_name,
+                                          position="No Record"))
         self._positions = positions
 
     def position_for_ad(self, ad_name):
@@ -696,7 +699,9 @@ def create_position_object(ballot, position, all_comments):
             p = v
     if not p:
         p = "No Record"
-    r = {"ad_name":str(position.ad), "position":p}
+    r = dict(ad_name=str(position.ad),
+             ad_username=position.ad.login_name, 
+             position=p)
     if not position.ad.is_current_ad():
         r['is_old_ad'] = True
         
diff --git a/branch/iesg-tracker/ietf/idrfc/tests.py b/branch/iesg-tracker/ietf/idrfc/tests.py
@@ -294,6 +294,30 @@ def test_edit_position(self):
         self.assertTrue(pos.discuss == -1)
         self.assertEquals(draft.idinternal.comments().count(), comments_before + 1)
         self.assertTrue("Position" in draft.idinternal.comments()[0].comment_text)
+
+    def test_edit_position_as_secretary(self):
+        draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
+        url = urlreverse('doc_edit_position', kwargs=dict(name=draft.filename))
+        url += "?ad=rhousley"
+        login_testing_unauthorized(self, "klm", url)
+
+        # normal get
+        r = self.client.get(url)
+        self.assertEquals(r.status_code, 200)
+        q = PyQuery(r.content)
+        self.assertTrue(len(q('form input[name=position]')) > 0)
+
+        # vote for rhousley
+        comments_before = draft.idinternal.comments().count()
+        self.assertTrue(not Position.objects.filter(ballot=draft.idinternal.ballot, ad__login_name="rhousley"))
+        
+        r = self.client.post(url, dict(position="discuss"))
+        self.assertEquals(r.status_code, 302)
+
+        pos = Position.objects.get(ballot=draft.idinternal.ballot, ad__login_name="rhousley")
+        self.assertTrue(pos.discuss)
+        self.assertTrue(not (pos.yes or pos.noobj or pos.abstain or pos.recuse))
+
         
     def test_send_ballot_comment(self):
         draft = InternetDraft.objects.get(filename="draft-ietf-mipshop-pfmipv6")
diff --git a/branch/iesg-tracker/ietf/idrfc/views_ballot.py b/branch/iesg-tracker/ietf/idrfc/views_ballot.py
@@ -63,9 +63,16 @@ def edit_position(request, name):
     if not doc.idinternal:
         raise Http404()
 
-    login = IESGLogin.objects.get(login_name=request.user.username)
-
-    pos, discuss, comment = get_ballot_info(doc.idinternal.ballot, login)
+    ad = login = IESGLogin.objects.get(login_name=request.user.username)
+
+    # if we're in the Secretariat, we can select an AD to act as stand-in for
+    if not in_group(request.user, "Area_Director"):
+        ad_username = request.GET.get('ad')
+        if not ad_username:
+            raise Http404()
+        ad = get_object_or_404(IESGLogin, login_name=ad_username)
+        
+    pos, discuss, comment = get_ballot_info(doc.idinternal.ballot, ad)
 
     if request.method == 'POST':
         form = EditPositionForm(request.POST)
@@ -78,7 +85,7 @@ def edit_position(request, name):
                 if pos.discuss:
                     pos.discuss = -1
             else:
-                pos = Position(ballot=doc.idinternal.ballot, ad=login)
+                pos = Position(ballot=doc.idinternal.ballot, ad=ad)
                 pos.discuss = 0
                 
             old_vote = position_to_ballot_choice(pos)
@@ -98,7 +105,7 @@ def edit_position(request, name):
             # save discuss
             if (discuss and clean['discuss_text'] != discuss.text) or (clean['discuss_text'] and not discuss):
                 if not discuss:
-                    discuss = IESGDiscuss(ballot=doc.idinternal.ballot, ad=login)
+                    discuss = IESGDiscuss(ballot=doc.idinternal.ballot, ad=ad)
 
                 discuss.text = clean['discuss_text']
                 discuss.date = date.today()
@@ -118,7 +125,7 @@ def edit_position(request, name):
             # than doing a clever hack here)
             if (comment and clean['comment_text'] != comment.text) or (clean['comment_text'] and not comment):
                 if not comment:
-                    comment = IESGComment(ballot=doc.idinternal.ballot, ad=login)
+                    comment = IESGComment(ballot=doc.idinternal.ballot, ad=ad)
 
                 comment.text = clean['comment_text']
                 comment.date = date.today()
@@ -153,7 +160,8 @@ def edit_position(request, name):
                               dict(doc=doc,
                                    form=form,
                                    discuss=discuss,
-                                   comment=comment),
+                                   comment=comment,
+                                   ad=ad),
                               context_instance=RequestContext(request))
 
 @group_required('Area_Director','Secretariat')
diff --git a/branch/iesg-tracker/ietf/templates/idrfc/doc_ballot.html b/branch/iesg-tracker/ietf/templates/idrfc/doc_ballot.html
@@ -35,10 +35,12 @@
 <table class="ietf-ballot"><tr valign="top"><td class="left">
 
 {% if doc_ballot_edit_button and user|in_group:"Area_Director,Secretariat" %}
+{% if user|in_group:"Area_Director" %}
 <div style="margin-top:8px; margin-bottom:8px;"><span id="doc_ballot_button" class="yui-button yui-link-button"><span class="first-child"><a href="{% url doc_edit_position name=doc.draft_name %}">Edit position</a></span></span></div>
+{% endif %}
 
 {% if ballot.was_deferred %}
-<div style="margin-top:8px; margin-bottom:8px;"><span id="doc_defer_ballot_button" class="yui-button yui-link-button"><span class="first-child"><a href="{% url doc_undefer_ballot name=doc.draft_name %}">Undefer ballot</a></span></span></div>
+<div style="margin-top:8px; margin-bottom:8px;"><span id="doc_undefer_ballot_button" class="yui-button yui-link-button"><span class="first-child"><a href="{% url doc_undefer_ballot name=doc.draft_name %}">Undefer ballot</a></span></span></div>
 <div style="margin-top:8px; margin-bottom:8px;">Ballot deferred by {{ ballot.deferred_by }} on {{ ballot.deferred_date }}.</div>
 {% else %}
 <div style="margin-top:8px; margin-bottom:8px;"><span id="doc_defer_ballot_button" class="yui-button yui-link-button"><span class="first-child"><a href="{% url doc_defer_ballot name=doc.draft_name %}">Defer ballot</a></span></span></div>
diff --git a/branch/iesg-tracker/ietf/templates/idrfc/doc_ballot_list.html b/branch/iesg-tracker/ietf/templates/idrfc/doc_ballot_list.html
@@ -1,5 +1,6 @@
+{% load ietf_filters %}
 {% for p in positions %}
-{% if p.is_old_ad %}[{%endif%}{{p.ad_name}}{% if p.is_old_ad %}]{%endif%}{% if p.has_text %}&nbsp;<a href="#{{p.ad_name|slugify}}"><img src="/images/comment.png" width="14" height="12" alt="*" border="0"/></a>{% endif %}<br/>
+{% if p.is_old_ad %}[{%endif%}<a{% if user|in_group:"Secretariat" %} href="{% url doc_edit_position name=doc.draft_name %}?ad={{ p.ad_username }}" title="Click to edit the position of {{ p.ad_name }}"{% endif %}>{{p.ad_name}}</a>{% if p.is_old_ad %}]{%endif%}{% if p.has_text %}&nbsp;<a href="#{{p.ad_name|slugify}}"><img src="/images/comment.png" width="14" height="12" alt="*" border="0"/></a>{% endif %}<br/>
 {% if p.old_positions %}<span class="was">(was {{p.old_positions|join:", "}})</span><br/>{%endif%}
 {% empty %}
 <i>none</i>
diff --git a/branch/iesg-tracker/ietf/templates/idrfc/edit_position.html b/branch/iesg-tracker/ietf/templates/idrfc/edit_position.html
@@ -2,25 +2,40 @@
   form.position-form .position ul {
     padding: 0;
     margin: 0;
-  }  
+  }
+  
   form.position-form .position li {
     list-style-type: none;
     float: left;
     padding-right: 10px;
   }
+  
   form.position-form .discuss-text {
     clear: left;
+    padding-top: 20px
+  }
+
+  form.position-form #id_discuss_text,
+  form.position-form #id_comment_text {
+    width: 700px;
+    height: 300px;
+  }
+
+  form.position-form .comment-text {
+    margin-top: 20px;
   }
 </style>
 
+<h3>Change position for {{ ad }}</h3>
+
 <form class="position-form" action="" method="POST">
   <div class="position">{{ form.position }}</div>
 
   <div class="discuss-text">{{ form.discuss_text.label_tag }}: {% if discuss %}(last edited {{ discuss.date }}){% endif %}</div>
   {{ form.discuss_text }}
   
   <div class="comment-text">{{ form.comment_text.label_tag }}: {% if comment %}(last edited {{ comment.date }}){% endif %}</div>
-  <div>{{ form.comment_text }}</div>
+  {{ form.comment_text }}
 
   <div class="actions">
     <a href="{{ doc.idinternal.get_absolute_url }}">Back</a>
