Fixed an issue when trying to edit a document state when there's no prior state, and removed the link to edit the document state when there's no set state.

- Legacy-Id: 6132

ietf/ietfworkflows/forms.py

@@ -167,7 +167,7 @@ class DraftTagsStateForm(StreamDraftForm):
         super(DraftTagsStateForm, self).__init__(*args, **kwargs)
         self.state = get_state_for_draft(self.draft)
         self.fields['new_state'].choices = self.get_states()
-        self.fields['new_state'].initial = self.state.pk
+        self.fields['new_state'].initial = self.state.pk if self.state else None
         if self.draft.stream_id == 'ietf':
             self.fields['new_state'].help_text = "Only select 'Submitted to IESG for Publication' to correct errors. Use the document's main page to request publication."
         if self.is_bound:

ietf/ietfworkflows/views.py

@@ -113,8 +113,8 @@ def edit_adopt(request, name):
     return _edit_draft_stream(request, draft, NoWorkflowStateForm)
 
 def edit_state(request, name):
-    draft = get_object_or_404(InternetDraft, filename=name)
-    if not can_edit_state(request.user, draft):
+    draft = get_object_or_404(InternetDraft, filename=name, stream__isnull=False)
+    if not can_edit_state(request.user, draft, ):
         return HttpResponseForbidden("You don't have permission to access this view")
     return _edit_draft_stream(request, draft, DraftTagsStateForm)
 

ietf/templates/doc/document_draft.html

@@ -92,20 +92,24 @@
     <tr><td colspan='2'><hr size='1' noshade /></td></tr>
 
     <tr>
-       <td>{{ doc.stream }} State:</td>
-       <td class="stream-state">
-         <a {% if can_edit_stream_info %}class="editlink" href="{% url edit_state name=doc.name %}"{% endif %}>
-           {{ stream_state|default:"(None)" }}
-         </a>
+       {% if doc.stream %}
+           <td>{{ doc.stream }} State:</td>
+           <td class="stream-state">
+               <a {% if doc.stream and can_edit_stream_info %}class="editlink" href="{% url edit_state name=doc.name %}"{% endif %}>
+               {{ stream_state|default:"(None)" }}
+             </a>
 
-       {% for m in milestones %}
-         <span title="{{ m.desc }} ({{ m.group.acronym }} milestone)" class="milestone">{{ m.due|date:"M Y" }}</span>
-       {% endfor %}
+           {% for m in milestones %}
+             <span title="{{ m.desc }} ({{ m.group.acronym }} milestone)" class="milestone">{{ m.due|date:"M Y" }}</span>
+           {% endfor %}
 
-       {% if stream_tags %}
-       <div class="stream-tags">{% for tag in stream_tags %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}</div>
+           {% if stream_tags %}
+           <div class="stream-tags">{% for tag in stream_tags %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}</div>
+           {% endif %}
+           </td>
+       {% else %}
+          <td>Stream State:</td><td>No stream defined</td>
        {% endif %}
-       </td>
     </tr>
 
     {% if consensus %}