Removed some remaining instances of render using context_instance. Fixed a case of tuple length of list of tuples passed to a template to be the same for all tuples.

- Legacy-Id: 12676
This commit is contained in:
Henrik Levkowetz 2017-01-19 17:08:27 +00:00
parent 2414b932e2
commit 7c2a161a5f
4 changed files with 20 additions and 20 deletions

View file

@ -246,7 +246,7 @@ def edit_ad(request, name):
'doc': review,
'titletext': titletext
},
context_instance = RequestContext(request))
)
def default_approval_text(review):
@ -454,7 +454,7 @@ def start_review_as_secretariat(request, name):
{'form': form,
'doc_to_review': doc_to_review,
},
context_instance = RequestContext(request))
)
def start_review_as_stream_owner(request, name):
"""Start the conflict review process using defaults for everything but notify and let the secretariat know"""
@ -488,4 +488,4 @@ def start_review_as_stream_owner(request, name):
{'form': form,
'doc_to_review': doc_to_review,
},
context_instance = RequestContext(request))
)

View file

@ -70,7 +70,7 @@ from ietf.review.utils import no_review_from_teams_on_doc
def render_document_top(request, doc, tab, name):
tabs = []
tabs.append(("Document", "document", urlreverse("doc_view", kwargs=dict(name=name)), True))
tabs.append(("Document", "document", urlreverse("doc_view", kwargs=dict(name=name)), True, None))
ballot = doc.latest_event(BallotDocEvent, type="created_ballot")
if doc.type_id in ("draft","conflrev", "statchg"):
@ -79,10 +79,10 @@ def render_document_top(request, doc, tab, name):
tabs.append(("IESG Review", "ballot", urlreverse("doc_ballot", kwargs=dict(name=name)), ballot, None if ballot else "IESG Review Ballot has not been created yet"))
if doc.type_id == "draft" or (doc.type_id == "charter" and doc.group.type_id == "wg"):
tabs.append(("IESG Writeups", "writeup", urlreverse("doc_writeup", kwargs=dict(name=name)), True))
tabs.append(("IESG Writeups", "writeup", urlreverse("doc_writeup", kwargs=dict(name=name)), True, None))
tabs.append(("Email expansions","email",urlreverse("doc_email", kwargs=dict(name=name)), True))
tabs.append(("History", "history", urlreverse("doc_history", kwargs=dict(name=name)), True))
tabs.append(("Email expansions","email",urlreverse("doc_email", kwargs=dict(name=name)), True, None))
tabs.append(("History", "history", urlreverse("doc_history", kwargs=dict(name=name)), True, None))
if name.startswith("rfc"):
name = "RFC %s" % name[3:]
@ -1103,7 +1103,7 @@ def edit_notify(request, name):
'doc': doc,
'titletext': titletext,
},
context_instance = RequestContext(request))
)
def email_aliases(request,name=''):
doc = get_object_or_404(Document, name=name) if name else None

View file

@ -1068,10 +1068,10 @@ def edit_ad(request, name):
form = AdForm(initial=init)
return render(request, 'doc/draft/change_ad.html',
{'form': form,
'doc': doc,
},
context_instance = RequestContext(request))
{'form': form,
'doc': doc,
},
)
class ConsensusForm(forms.Form):
consensus = forms.ChoiceField(choices=(("Unknown", "Unknown"), ("Yes", "Yes"), ("No", "No")),
@ -1112,7 +1112,7 @@ def edit_consensus(request, name):
{'form': form,
'doc': doc,
},
context_instance = RequestContext(request))
)
class PublicationForm(forms.Form):
subject = forms.CharField(max_length=200, required=True)
@ -1205,7 +1205,7 @@ def request_publication(request, name):
True if (doc.stream_id and doc.stream_id=='ietf')
else (consensus_event != None and consensus_event.consensus != None)),
),
context_instance = RequestContext(request))
)
class AdoptDraftForm(forms.Form):
group = forms.ModelChoiceField(queryset=Group.objects.filter(type__in=["wg", "rg"], state="active").order_by("-type", "acronym"), required=True, empty_label=None)

View file

@ -229,7 +229,7 @@ def edit_title(request, name):
'doc': status_change,
'titletext' : titletext,
},
context_instance = RequestContext(request))
)
@role_required("Area Director", "Secretariat")
def edit_ad(request, name):
@ -260,7 +260,7 @@ def edit_ad(request, name):
'doc': status_change,
'titletext' : titletext,
},
context_instance = RequestContext(request))
)
def newstatus(relateddoc):
@ -493,7 +493,7 @@ def rfc_status_changes(request):
return render(request, 'doc/status_change/status_changes.html',
{'docs' : doclist,
},
context_instance = RequestContext(request))
)
@role_required("Area Director","Secretariat")
def start_rfc_status_change(request,name):
@ -552,7 +552,7 @@ def start_rfc_status_change(request,name):
{'form': form,
'relation_slugs': relation_slugs,
},
context_instance = RequestContext(request))
)
@role_required("Area Director", "Secretariat")
def edit_relations(request, name):
@ -602,7 +602,7 @@ def edit_relations(request, name):
'form': form,
'relation_slugs': relation_slugs,
},
context_instance = RequestContext(request))
)
def generate_last_call_text(request, doc):
@ -695,5 +695,5 @@ def last_call(request, name):
last_call_event = last_call_event,
last_call_form = form,
),
context_instance = RequestContext(request))
)