Fix adoption test to unset the stream, fix bugs with non-stream drafts

- Legacy-Id: 3852

ietf/ietfworkflows/accounts.py

@@ -118,7 +118,7 @@ def can_edit_stream(user, draft):
     return is_secretariat(user)
 
 def can_adopt(user, draft):
-    if settings.USE_DB_REDESIGN_PROXY_CLASSES and draft.stream_id == "ietf" and draft.group.type_id == "individ":
+    if settings.USE_DB_REDESIGN_PROXY_CLASSES and (not draft.stream or draft.stream_id == "ietf") and draft.group.type_id == "individ":
         person = get_person_for_user(user)
         if not person:
             return False

ietf/ietfworkflows/forms.py

@@ -97,7 +97,9 @@ class NoWorkflowStateForm(StreamDraftForm):
                 e.time = doc.time
                 e.by = self.user.get_profile()
                 e.doc = doc
-                e.desc = u"Stream changed to <b>%s</b> from %s" % (new_stream.name, doc.stream.name)
+                e.desc = u"Changed to <b>%s</b>" % new_stream.name
+                if doc.stream:
+                    e.desc += u" from %s" % doc.stream.name
                 e.save()
                 doc.stream = new_stream
 

ietf/ietfworkflows/streams.py

@@ -27,7 +27,8 @@ def get_streamed_draft(draft):
 def get_stream_from_draft(draft):
     if settings.USE_DB_REDESIGN_PROXY_CLASSES:
         s = super(InternetDraft, draft).stream
-        s.with_groups = s.slug in ["ietf", "irtf"]
+        if s:
+            s.with_groups = s.slug in ["ietf", "irtf"]
         return s
 
     streamedid = get_streamed_draft(draft)

ietf/ietfworkflows/tests.py

@@ -23,10 +23,10 @@ class EditStreamInfoTestCase(django.test.TestCase):
 
     def test_adopt_document(self):
         draft = make_test_data()
-        draft.stream_id = "ise"
+        draft.stream = None
         draft.group = Group.objects.get(type="individ")
-        draft.unset_state("draft-stream-ietf")
         draft.save()
+        draft.unset_state("draft-stream-ietf")
 
         url = urlreverse('edit_adopt', kwargs=dict(name=draft.name))
         login_testing_unauthorized(self, "marschairman", url)