updates to announcements and groups view to match secretariat production branch

 - Legacy-Id: 6140

Author: rpcross

ietf/secr/announcement/views.py

@@ -38,9 +38,9 @@ def check_access(user):
                            group__acronym='iab',
                            name='execdir'):
         return True
-    
+
     return False
-    
+
 # --------------------------------------------------
 # STANDARD VIEW FUNCTIONS
 # --------------------------------------------------
@@ -54,12 +54,16 @@ def main(request):
     '''
     if not check_access(request.user):
         return HttpResponseForbidden('Restricted to: Secretariat, IAD, or chair of IETF, IAB, RSOC, RSE, IAOC, NomCom.')
-    
+
     form = AnnounceForm(request.POST or None,user=request.user)
-    
+
     if form.is_valid():
-        request.session['data'] = form.cleaned_data
-        
+        # nomcom is a ModelChoice, store pk, not Group object
+        data = form.cleaned_data
+        if data['nomcom']:
+            data['nomcom'] = data['nomcom'].pk
+        request.session['data'] = data
+
         url = reverse('announcement_confirm')
         return HttpResponseRedirect(url)
 
@@ -70,40 +74,39 @@ def main(request):
 
 @check_for_cancel('../')
 def confirm(request):
-    
-    # testing
-    #assert False, (request.session.get_expiry_age(),request.session.get_expiry_date())
-    
+
     if request.method == 'POST':
         form = AnnounceForm(request.session['data'],user=request.user)
         message = form.save(user=request.user,commit=True)
-        send_mail_text(None, 
+        extra = {'Reply-To':message.reply_to}
+        send_mail_text(None,
                        message.to,
                        message.frm,
                        message.subject,
                        message.body,
                        cc=message.cc,
-                       bcc=message.bcc)
+                       bcc=message.bcc,
+                       extra=extra)
 
         # clear session
         request.session.clear()
-        
+
         messages.success(request, 'The announcement was sent.')
         url = reverse('announcement')
         return HttpResponseRedirect(url)
-    
+
     if request.session.get('data',None):
         data = request.session['data']
     else:
         messages.error(request, 'No session data.  Your session may have expired or cookies are disallowed.')
         redirect_url = reverse('announcement')
         return HttpResponseRedirect(redirect_url)
-    
+
     if data['to'] == 'Other...':
         to = ','.join(data['to_custom'])
     else:
         to = data['to']
-        
+
     return render_to_response('announcement/confirm.html', {
         'message': data,
         'to': to},

ietf/secr/groups/views.py

@@ -55,7 +55,7 @@ def add_legacy_fields(group):
     group.chairs = group.role_set.filter(name="chair")
     group.techadvisors = group.role_set.filter(name="techadv")
     group.editors = group.role_set.filter(name="editor")
-    group.secretaries = group.role_set.filter(name="secretaries")
+    group.secretaries = group.role_set.filter(name="secr")
 
     #fill_in_charter_info(group)