Delete all old WGAction stuff, it's superceded by the WG charter

support, clean up iesg/models.py a bit
 - Legacy-Id: 6411

Author: OleLaursen

ietf/iesg/admin.py

@@ -5,9 +5,5 @@ class TelechatAgendaItemAdmin(admin.ModelAdmin):
     pass
 admin.site.register(TelechatAgendaItem, TelechatAgendaItemAdmin)
 
-class WGActionAdmin(admin.ModelAdmin):
-    pass
-admin.site.register(WGAction, WGActionAdmin)
-
 admin.site.register(TelechatDate)
 

ietf/iesg/models.py

@@ -37,49 +37,6 @@
 from ietf.idtracker.models import Acronym
 import datetime
 
-# This table is not used by any code right now, and according to Glen,
-# probably not currently (Aug 2009) maintained by the secretariat.
-#class TelechatMinutes(models.Model):
-#    telechat_date = models.DateField(null=True, blank=True)
-#    telechat_minute = models.TextField(blank=True)
-#    exported = models.IntegerField(null=True, blank=True)
-#    def get_absolute_url(self):
-#	return "/iesg/telechat/%d/" % self.id
-#    def __str__(self):
-#	return "IESG Telechat Minutes for %s" % self.telechat_date
-#    class Meta:
-#        db_table = 'telechat_minutes'
-#        verbose_name = "Telechat Minute Text"
-#        verbose_name_plural = "Telechat Minutes"
-
-# this model is deprecated
-class TelechatDates(models.Model):
-    date1 = models.DateField(primary_key=True, null=True, blank=True)
-    date2 = models.DateField(null=True, blank=True)
-    date3 = models.DateField(null=True, blank=True)
-    date4 = models.DateField(null=True, blank=True)
-    def dates(self):
-        l = []
-        if self.date1:
-            l.append(self.date1)
-        if self.date2:
-            l.append(self.date2)
-        if self.date3:
-            l.append(self.date3)
-        if self.date4:
-            l.append(self.date4)
-        return l
-
-    def save(self):
-        # date1 isn't really a primary id, so save() doesn't work
-        raise NotImplemented
-    
-    def __str__(self):
-        return " / ".join([str(d) for d in [self.date1,self.date2,self.date3,self.date4]])
-    class Meta:
-        db_table = "telechat_dates"
-        verbose_name = "Next Telechat Date"
-
 class TelechatAgendaItem(models.Model):
     TYPE_CHOICES = (
         (1, "Working Group News"),
@@ -98,34 +55,6 @@ class TelechatAgendaItem(models.Model):
     def __unicode__(self):
         type_name = self.TYPE_CHOICES_DICT.get(self.type, str(self.type))
         return u'%s: %s' % (type_name, self.title or "")
-    class Meta:
-        if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
-            db_table = 'templates'
-
-class WGAction(models.Model):
-    CATEGORY_CHOICES = (
-        (11, "WG Creation::In Internal Review"),
-        (12, "WG Creation::Proposed for IETF Review"),
-        (13, "WG Creation::Proposed for Approval"),
-        (21, "WG Rechartering::In Internal Review"),
-        (22, "WG Rechartering::Under evaluation for IETF Review"),
-        (23, "WG Rechartering::Proposed for Approval")
-    )
-    # note that with the new schema, Acronym is monkey-patched and is really Group
-    group_acronym = models.ForeignKey(Acronym, db_column='group_acronym_id', primary_key=True, unique=True)
-    note = models.TextField(blank=True,null=True)
-    status_date = models.DateField()
-    agenda = models.BooleanField("On Agenda")
-    token_name = models.CharField(max_length=25)
-    category = models.IntegerField(db_column='pwg_cat_id', choices=CATEGORY_CHOICES, default=11)
-    telechat_date = models.DateField() #choices = [(x.telechat_date,x.telechat_date) for x in Telechat.objects.all().order_by('-telechat_date')])
-    def __str__(self):
-        return str(self.telechat_date)+": "+str(self.group_acronym)
-    class Meta:
-        if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
-            db_table = 'group_internal'
-        ordering = ['-telechat_date']
-        verbose_name = "WG Action"
 
 class Telechat(models.Model):
     telechat_id = models.IntegerField(primary_key=True)
@@ -160,55 +89,3 @@ def __unicode__(self):
 
     class Meta:
         ordering = ['-date']
-
-class TelechatDatesProxyDummy(object):
-    def all(self):
-        class Dummy(object):
-            def __getitem__(self, i):
-                return self
-
-            def get_date(self, index):
-                if not hasattr(self, "date_cache"):
-                    self.date_cache = TelechatDate.objects.active().order_by("date")
-
-                if index < len(self.date_cache):
-                    return self.date_cache[index].date
-                return None
-
-            #date1 = models.DateField(primary_key=True, null=True, blank= True)
-            @property
-            def date1(self):
-                return self.get_date(0)
-            #date2 = models.DateField(null=True, blank=True)
-            @property
-            def date2(self):
-                return self.get_date(1)
-            #date3 = models.DateField(null=True, blank=True)
-            @property
-            def date3(self):
-                return self.get_date(2)
-            #date4 = models.DateField(null=True, blank=True)
-            @property
-            def date4(self):
-                return self.get_date(3)
-
-            def dates(self):
-                l = []
-                if self.date1:
-                    l.append(self.date1)
-                if self.date2:
-                    l.append(self.date2)
-                if self.date3:
-                    l.append(self.date3)
-                if self.date4:
-                    l.append(self.date4)
-                return l
-
-        return Dummy()
-
-class TelechatDatesProxy(object):
-    objects = TelechatDatesProxyDummy()
-
-if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-    TelechatDatesOld = TelechatDates
-    TelechatDates = TelechatDatesProxy

ietf/iesg/tests.py

@@ -242,136 +242,6 @@ def test_reschedule(self):
         self.assertTrue(not draft.latest_event(TelechatDocEvent, "scheduled_for_telechat").returning_item)
         self.assertEquals(draft.docevent_set.count(), events_before + 1)
 
-
-class WorkingGroupActionsTestCaseREDESIGN(django.test.TestCase):
-    def setUp(self):
-        super(self.__class__, self).setUp()
-
-        curdir = os.path.dirname(os.path.abspath(__file__))
-        self.evaldir = os.path.join(curdir, "tmp-testdir")
-        os.mkdir(self.evaldir)
-        
-        src = os.path.join(curdir, "fixtures", "sieve-charter.txt")
-        shutil.copy(src, self.evaldir)
-        
-        settings.IESG_WG_EVALUATION_DIR = self.evaldir
-
-    def tearDown(self):
-        super(self.__class__, self).tearDown()
-        shutil.rmtree(self.evaldir)
-        
-    
-    def test_working_group_actions(self):
-        make_test_data()
-        
-        url = urlreverse('iesg_working_group_actions')
-        login_testing_unauthorized(self, "secretary", url)
-
-        r = self.client.get(url)
-        self.assertEquals(r.status_code, 200)
-        q = PyQuery(r.content)
-        for wga in WGAction.objects.all():
-            self.assertTrue(wga.group_acronym.name in r.content)
-
-        self.assertTrue('(sieve)' in r.content)
-
-    def test_delete_wgaction(self):
-        make_test_data()
-        
-        wga = WGAction.objects.all()[0]
-        url = urlreverse('iesg_edit_working_group_action', kwargs=dict(wga_id=wga.pk))
-        login_testing_unauthorized(self, "secretary", url)
-
-        r = self.client.post(url, dict(delete="1"))
-        self.assertEquals(r.status_code, 302)
-        self.assertTrue(not WGAction.objects.filter(pk=wga.pk))
-
-    def test_edit_wgaction(self):
-        make_test_data()
-        
-        wga = WGAction.objects.all()[0]
-        url = urlreverse('iesg_edit_working_group_action', kwargs=dict(wga_id=wga.pk))
-        login_testing_unauthorized(self, "secretary", url)
-
-        # normal get
-        r = self.client.get(url)
-        self.assertEquals(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertEquals(len(q('form select[name=token_name]')), 1)
-        self.assertEquals(len(q('form select[name=telechat_date]')), 1)
-
-        # change
-        dates = TelechatDate.objects.active()
-        token_name = Person.objects.get(name="Ad No1").plain_name()
-        old = wga.pk
-        r = self.client.post(url, dict(status_date=dates[0].date.isoformat(),
-                                       token_name=token_name,
-                                       category="23",
-                                       note="Testing.",
-                                       telechat_date=dates[3].date.isoformat()))
-        self.assertEquals(r.status_code, 302)
-
-        wga = WGAction.objects.get(pk=old)
-        self.assertEquals(wga.status_date, dates[0].date)
-        self.assertEquals(wga.token_name, token_name)
-        self.assertEquals(wga.category, 23)
-        self.assertEquals(wga.note, "Testing.")
-        self.assertEquals(wga.telechat_date, dates[3].date)
-        
-    def test_add_possible_wg(self):
-        make_test_data()
-        
-        url = urlreverse('iesg_working_group_actions')
-        login_testing_unauthorized(self, "secretary", url)
-        
-        r = self.client.post(url, dict(add="1",
-                                       filename='sieve-charter.txt'))
-        self.assertEquals(r.status_code, 302)
-
-        # now we got back a URL we can use for adding, but first make
-        # sure we got a proposed group with the acronym
-        group = Group.objects.create(
-            name="Sieve test test",
-            acronym="sieve",
-            state_id="proposed",
-            type_id="wg",
-            parent=None
-            )
-        
-        add_url = r['Location']
-        r = self.client.get(add_url)
-        self.assertEquals(r.status_code, 200)
-        q = PyQuery(r.content)
-        self.assertTrue('(sieve)' in r.content)
-        self.assertEquals(len(q('form select[name=token_name]')), 1)
-        self.assertEquals(q('form input[name=status_date]')[0].get("value"), "2010-05-07")
-        self.assertEquals(len(q('form select[name=telechat_date]')), 1)
-
-        wgas_before = WGAction.objects.all().count()
-        dates = TelechatDate.objects.active()
-        token_name = Person.objects.get(name="Ad No1").plain_name()
-        r = self.client.post(add_url,
-                             dict(status_date=dates[0].date.isoformat(),
-                                  token_name=token_name,
-                                  category="23",
-                                  note="Testing.",
-                                  telechat_date=dates[3].date.isoformat()))
-        self.assertEquals(r.status_code, 302)
-        self.assertEquals(wgas_before + 1, WGAction.objects.all().count())
-        
-    def test_delete_possible_wg(self):
-        make_test_data()
-        
-        url = urlreverse('iesg_working_group_actions')
-        login_testing_unauthorized(self, "secretary", url)
-        
-        r = self.client.post(url, dict(delete="1",
-                                       filename='sieve-charter.txt'))
-        self.assertEquals(r.status_code, 200)
-
-        self.assertTrue('(sieve)' not in r.content)
-
-
 class IesgUrlTestCase(SimpleUrlTestCase):
     def testUrls(self):
         self.doTestUrls(__file__)

ietf/iesg/urls.py

@@ -39,6 +39,7 @@
 urlpatterns = patterns('',
     (r'^telechat/.*$', 'django.views.generic.simple.redirect_to', { 'url': 'http://www.ietf.org/iesg/minutes.html' }),
     (r'^ann/(?:ind|new|prev)/$', 'django.views.generic.simple.redirect_to', { 'url': "/iesg/decisions/", 'permanent': True }),
+    (r'^telechatdates/$', 'django.views.generic.simple.redirect_to', { 'url': '/admin/iesg/telechatdate/' }),
 
     (r'^decisions/(?:(?P<year>[0-9]{4})/)?$', views.review_decisions),
     (r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?$', views.agenda),
@@ -47,13 +48,10 @@
     (r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?scribe_template.html$', views.agenda_scribe_template),
     (r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?moderator_package.html$', views.agenda_moderator_package),
     (r'^agenda/(?:(?P<date>\d{4}-\d{2}-\d{2})/)?agenda_package.txt$', views.agenda_package),
+
     (r'^agenda/documents.txt$', views.agenda_documents_txt),
     (r'^agenda/documents/$', views.agenda_documents),
-    (r'^agenda/telechat-(?P<year>\d+)-(?P<month>\d+)-(?P<day>\d+)-docs.tgz', views.telechat_docs_tarfile),
+    (r'^agenda/telechat-(?:(?P<date>\d{4}-\d{2}-\d{2})-)?docs.tgz', views.telechat_docs_tarfile),
     (r'^discusses/$', views.discusses),
     (r'^milestones/$', views.milestones_needing_review),
-    (r'^telechatdates/$', 'django.views.generic.simple.redirect_to', { 'url': '/admin/iesg/telechatdate/' }),
-    url(r'^wgactions/$', views.working_group_actions, name="iesg_working_group_actions"),
-    url(r'^wgactions/add/$', views.edit_working_group_action, { 'wga_id': None }, name="iesg_add_working_group_action"),
-    url(r'^wgactions/(?P<wga_id>\d+)/$', views.edit_working_group_action, name="iesg_edit_working_group_action"),
 )