Removed the "announce" functionality from /secr/drafts. Addresses part of #2513. Commit ready for merge.

- Legacy-Id: 15112

ietf/secr/drafts/tests_views.py

@@ -14,8 +14,6 @@ from ietf.doc.factories import DocumentFactory
 from ietf.doc.models import State, Document
 from ietf.meeting.factories import MeetingFactory
 from ietf.person.factories import PersonFactory
-from ietf.person.models import Person
-from ietf.submit.models import Preapproval
 from ietf.submit.tests import submission_file
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 from ietf.utils.test_data import make_test_data
@@ -74,23 +72,6 @@ class SecrDraftsTestCase(TestCase):
         response = self.client.post(url,post)
         self.assertEqual(response.status_code, 302)
         
-    def test_announce(self):
-        draft = make_test_data()
-        url = urlreverse('ietf.secr.drafts.views.announce', kwargs={'id':draft.name})
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 302)
-        
-    def test_approvals(self):
-        make_test_data()
-        Preapproval.objects.create(name='draft-dummy',
-            by=Person.objects.get(name="(System)"))
-        url = urlreverse('ietf.secr.drafts.views.approvals')
-        self.client.login(username="secretary", password="secretary+password")
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue('draft-dummy' in response.content)
-    
     def test_edit(self):
         draft = make_test_data()
         url = urlreverse('ietf.secr.drafts.views.edit', kwargs={'id':draft.name})

ietf/secr/drafts/urls.py

@@ -10,7 +10,6 @@ urlpatterns = [
     url(r'^nudge-report/$', views.nudge_report),
     url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/$', views.view),
     url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/abstract/$', views.abstract),
-    url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/announce/$', views.announce),
     url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/authors/$', views.authors),
     url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/author_delete/(?P<oid>\d{1,6})$', views.author_delete),
     url(r'^(?P<id>[A-Za-z0-9._\-\+]+)/confirm/$', views.confirm),

ietf/secr/drafts/views.py

@@ -480,31 +480,6 @@ def add(request):
         'upload_form': upload_form},
     )
 
-@role_required('Secretariat')
-def announce(request, id):
-    '''
-    Schedule announcement of new Internet-Draft to I-D Announce list
-
-    **Templates:**
-
-    * none
-
-    **Template Variables:**
-
-    * none
-    '''
-    draft = get_object_or_404(Document, name=id)
-
-    email_form = EmailForm(get_email_initial(draft,action='new'))
-                            
-    announcement_from_form(email_form.data,
-                           by=request.user.person,
-                           from_val='Internet-Drafts@ietf.org',
-                           content_type='Multipart/Mixed; Boundary="NextPart"')
-            
-    messages.success(request, 'Announcement scheduled successfully!')
-    return redirect('ietf.secr.drafts.views.view', id=id)
-
 @role_required('Secretariat')
 def approvals(request):
     '''

ietf/secr/templates/drafts/view.html

@@ -85,7 +85,6 @@
             <li><button {% if is_expired or is_withdrawn %}{% else %}disabled="disabled"{% endif %}onclick="window.location='{% url "ietf.secr.drafts.views.email" id=draft.name %}?action=resurrect'">Resurrect</button></li>
             <li><button {% if is_active %}{% else %}disabled="disabled"{% endif %}onclick="window.location='extend/'">Extend Expiry</button></li>
             <li><button {% if is_active %}{% else %}disabled="disabled"{% endif %}onclick="window.location='withdraw/'">Withdraw</button></li>
-            <li><button {% if is_active %}{% else %}disabled="disabled"{% endif %}onclick="window.location='announce/'">Announcement</button></li>
             <li><button {% if is_active %}{% else %}disabled="disabled"{% endif %}onclick="window.location='makerfc/'">Make RFC</button></li>
           </ul>
       </div> <!-- inline-related -->