Merged in [12521] from rjsparks@nostrum.com:

Removes classes obviated in r12520.  Should be held for release after r12520 is released?
 - Legacy-Id: 12590
Note: SVN reference [12521] has been migrated to Git commit 483d9db895

ietf/review/admin.py

@@ -1,7 +1,6 @@
 from django.contrib import admin
 
-from ietf.review.models import (ReviewerSettings, UnavailablePeriod, ReviewWish,
-                                ResultUsedInReviewTeam, TypeUsedInReviewTeam, NextReviewerInTeam,
+from ietf.review.models import (ReviewerSettings, UnavailablePeriod, ReviewWish, NextReviewerInTeam,
                                 ReviewRequest, ReviewTeamSettings )
 
 class ReviewerSettingsAdmin(admin.ModelAdmin):
@@ -36,24 +35,6 @@ class ReviewWishAdmin(admin.ModelAdmin):
 
 admin.site.register(ReviewWish, ReviewWishAdmin)
 
-class ResultUsedInReviewTeamAdmin(admin.ModelAdmin):
-    list_display = ["team", "result"]
-    list_display_links = ["team"]
-    list_filter = ["team"]
-    ordering = ["team", "result__order"]
-    raw_id_fields = ["team"]
-
-admin.site.register(ResultUsedInReviewTeam, ResultUsedInReviewTeamAdmin)
-
-class TypeUsedInReviewTeamAdmin(admin.ModelAdmin):
-    list_display = ["team", "type"]
-    list_display_links = ["team"]
-    list_filter = ["team"]
-    ordering = ["team", "type__order"]
-    raw_id_fields = ["team"]
-
-admin.site.register(TypeUsedInReviewTeam, TypeUsedInReviewTeamAdmin)
-
 class NextReviewerInTeamAdmin(admin.ModelAdmin):
     list_display = ["team", "next_reviewer"]
     list_display_links = ["team"]

ietf/review/models.py

@@ -86,33 +86,6 @@ class ReviewWish(models.Model):
     class Meta:
         verbose_name_plural = "review wishes"
     
-class ResultUsedInReviewTeam(models.Model):
-    """Captures that a result name is valid for a given team for new
-    reviews. This also implicitly defines which teams are review
-    teams - if there are no possible review results valid for a given
-    team, it can't be a review team."""
-    team        = models.ForeignKey(Group)
-    result      = models.ForeignKey(ReviewResultName)
-
-    def __unicode__(self):
-        return u"{} in {}".format(self.result.name, self.team.acronym)
-
-    class Meta:
-        verbose_name = "review result used in team setting"
-        verbose_name_plural = "review result used in team settings"
-    
-class TypeUsedInReviewTeam(models.Model):
-    """Captures that a type name is valid for a given team for new
-    reviews. """
-    team        = models.ForeignKey(Group, limit_choices_to=~models.Q(reviewteamsettings=None))
-    type        = models.ForeignKey(ReviewTypeName)
-
-    def __unicode__(self):
-        return u"{} in {}".format(self.type.name, self.team.acronym)
-
-    class Meta:
-        verbose_name = "review type used in team setting"
-        verbose_name_plural = "review type used in team settings"
 
 class NextReviewerInTeam(models.Model):
     team        = models.ForeignKey(Group, limit_choices_to=~models.Q(reviewteamsettings=None))

ietf/review/resources.py

@@ -8,7 +8,6 @@ from ietf import api
 from ietf.api import ToOneField                         # pyflakes:ignore
 
 from ietf.review.models import (ReviewerSettings, ReviewRequest,
-                                ResultUsedInReviewTeam, TypeUsedInReviewTeam,
                                 UnavailablePeriod, ReviewWish, NextReviewerInTeam,
                                 ReviewSecretarySettings, ReviewTeamSettings )
 
@@ -72,27 +71,6 @@ class ReviewRequestResource(ModelResource):
         }
 api.review.register(ReviewRequestResource())
 
-
-
-from ietf.group.resources import GroupResource
-from ietf.name.resources import ReviewResultNameResource
-class ResultUsedInReviewTeamResource(ModelResource):
-    team             = ToOneField(GroupResource, 'team')
-    result           = ToOneField(ReviewResultNameResource, 'result')
-    class Meta:
-        queryset = ResultUsedInReviewTeam.objects.all()
-        serializer = api.Serializer()
-        cache = SimpleCache()
-        #resource_name = 'resultusedinreviewteam'
-        filtering = { 
-            "id": ALL,
-            "team": ALL_WITH_RELATIONS,
-            "result": ALL_WITH_RELATIONS,
-        }
-api.review.register(ResultUsedInReviewTeamResource())
-
-
-
 from ietf.person.resources import PersonResource
 from ietf.group.resources import GroupResource
 class UnavailablePeriodResource(ModelResource):
@@ -153,27 +131,6 @@ class NextReviewerInTeamResource(ModelResource):
         }
 api.review.register(NextReviewerInTeamResource())
 
-
-
-from ietf.group.resources import GroupResource
-from ietf.name.resources import ReviewTypeNameResource
-class TypeUsedInReviewTeamResource(ModelResource):
-    team             = ToOneField(GroupResource, 'team')
-    type             = ToOneField(ReviewTypeNameResource, 'type')
-    class Meta:
-        queryset = TypeUsedInReviewTeam.objects.all()
-        serializer = api.Serializer()
-        cache = SimpleCache()
-        #resource_name = 'typeusedinreviewteam'
-        filtering = { 
-            "id": ALL,
-            "team": ALL_WITH_RELATIONS,
-            "type": ALL_WITH_RELATIONS,
-        }
-api.review.register(TypeUsedInReviewTeamResource())
-
-
-
 from ietf.person.resources import PersonResource
 from ietf.group.resources import GroupResource
 class ReviewSecretarySettingsResource(ModelResource):