Rename DocStreamName to StreamName, they're not really doc-specific

- Legacy-Id: 3707

ietf/idrfc/mirror_rfc_index.py

@@ -162,15 +162,15 @@ def get_std_level_mapping():
         }
 
 def get_stream_mapping():
-    from name.models import DocStreamName
+    from name.models import StreamName
     from name.utils import name
 
     return {
-        "Legacy": name(DocStreamName, "legacy", "Legacy"),
-        "IETF": name(DocStreamName, "ietf", "IETF"),
-        "INDEPENDENT": name(DocStreamName, "ise", "ISE", desc="Independent submission editor stream"),
-        "IAB": name(DocStreamName, "iab", "IAB"),
-        "IRTF": name(DocStreamName, "irtf", "IRTF"),
+        "Legacy": name(StreamName, "legacy", "Legacy"),
+        "IETF": name(StreamName, "ietf", "IETF"),
+        "INDEPENDENT": name(StreamName, "ise", "ISE", desc="Independent submission editor stream"),
+        "IAB": name(StreamName, "iab", "IAB"),
+        "IRTF": name(StreamName, "irtf", "IRTF"),
     }
 
 

ietf/idrfc/views_edit.py

@@ -28,7 +28,7 @@ from ietf.ietfworkflows.utils import update_stream
 from ietf.ietfworkflows.streams import get_stream_from_draft
 
 from redesign.doc.models import *
-from redesign.name.models import IntendedStdLevelName, DocTagName, DocStreamName
+from redesign.name.models import IntendedStdLevelName, DocTagName, StreamName
 from redesign.person.models import Person, Email
 
 class ChangeStateForm(forms.Form):
@@ -417,7 +417,7 @@ def edit_info(request, name):
 class EditInfoFormREDESIGN(forms.Form):
     intended_std_level = forms.ModelChoiceField(IntendedStdLevelName.objects.all(), empty_label=None, required=True)
     via_rfc_editor = forms.BooleanField(required=False, label="Via IRTF or RFC Editor")
-    stream = forms.ModelChoiceField(DocStreamName.objects.all(), empty_label=None, required=True)
+    stream = forms.ModelChoiceField(StreamName.objects.all(), empty_label=None, required=True)
     ad = forms.ModelChoiceField(Person.objects.filter(role__name="ad", role__group__state="active").order_by('name'), label="Responsible AD", empty_label=None, required=True)
     create_in_state = forms.ModelChoiceField(State.objects.filter(type="draft-iesg", slug__in=("pub-req", "watching")), empty_label=None, required=False)
     notify = forms.CharField(max_length=255, label="Notice emails", help_text="Separate email addresses with commas", required=False)

ietf/ietfworkflows/forms.py

@@ -20,7 +20,7 @@ from ietf.ietfworkflows.streams import (get_stream_from_draft, get_streamed_draf
 from ietf.ietfworkflows.constants import CALL_FOR_ADOPTION, IETF_STREAM
 from redesign.doc.utils import get_tags_for_stream_id
 from redesign.doc.models import save_document_in_history, DocEvent, Document
-from redesign.name.models import DocTagName, DocStreamName, RoleName
+from redesign.name.models import DocTagName, StreamName, RoleName
 from redesign.group.models import Group, GroupStateTransitions, Role
 from redesign.person.models import Person, Email
 
@@ -89,7 +89,7 @@ class NoWorkflowStateForm(StreamDraftForm):
 
             doc.time = datetime.datetime.now()
 
-            new_stream = DocStreamName.objects.get(slug="ietf")
+            new_stream = StreamName.objects.get(slug="ietf")
 
             if doc.stream != new_stream:
                 e = DocEvent(type="changed_stream")
@@ -296,7 +296,7 @@ class DraftStreamForm(StreamDraftForm):
 
     comment = forms.CharField(widget=forms.Textarea)
     if settings.USE_DB_REDESIGN_PROXY_CLASSES:
-        stream = forms.ModelChoiceField(DocStreamName.objects.exclude(slug="legacy"))
+        stream = forms.ModelChoiceField(StreamName.objects.exclude(slug="legacy"))
     else:
         stream = forms.ModelChoiceField(Stream.objects.all())
 

ietf/submit/utils.py

@@ -119,7 +119,7 @@ def perform_postREDESIGN(submission):
     else:
         stream_slug = "ietf"
 
-    draft.stream = DocStreamName.objects.get(slug=stream_slug)
+    draft.stream = StreamName.objects.get(slug=stream_slug)
     draft.save()
 
     draft.set_state(State.objects.get(type="draft", slug="active"))

redesign/doc/models.py

@@ -43,7 +43,7 @@ class DocumentInfo(models.Model):
 
     states = models.ManyToManyField(State, blank=True) # plain state (Active/Expired/...), IESG state, stream state
     tags = models.ManyToManyField(DocTagName, blank=True, null=True) # Revised ID Needed, ExternalParty, AD Followup, ...
-    stream = models.ForeignKey(DocStreamName, blank=True, null=True) # IETF, IAB, IRTF, Independent Submission
+    stream = models.ForeignKey(StreamName, blank=True, null=True) # IETF, IAB, IRTF, Independent Submission
     group = models.ForeignKey(Group, blank=True, null=True) # WG, RG, IAB, IESG, Edu, Tools
 
     abstract = models.TextField()

redesign/name/admin.py

@@ -9,7 +9,7 @@ admin.site.register(GroupTypeName, NameAdmin)
 admin.site.register(GroupStateName, NameAdmin)
 admin.site.register(IesgGroupStateName, NameAdmin)
 admin.site.register(RoleName, NameAdmin)
-admin.site.register(DocStreamName, NameAdmin)
+admin.site.register(StreamName, NameAdmin)
 admin.site.register(DocRelationshipName, NameAdmin)
 admin.site.register(DocTypeName, NameAdmin)
 admin.site.register(DocTagName, NameAdmin)

redesign/name/models.py

@@ -27,7 +27,7 @@ class IesgGroupStateName(NameModel):
     review """
 class RoleName(NameModel):
     """AD, Chair"""
-class DocStreamName(NameModel):
+class StreamName(NameModel):
     """IETF, IAB, IRTF, ISE, Legacy"""
 class DocRelationshipName(NameModel):
     """Updates, Replaces, Obsoletes, Reviews, ... The relationship is

redesign/name/proxy.py

@@ -48,7 +48,7 @@ class AnnotationTagObjectRelationProxy(DocTagName):
     class Meta:
         proxy = True
 
-class StreamProxy(DocStreamName):
+class StreamProxy(StreamName):
     def get_chairs(self):
         from redesign.group.models import Role
         from redesign.proxy_utils import proxy_personify_role