From 9842eef40588b717cbafa56e69bf60b8f01d0078 Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Fri, 25 Oct 2013 12:53:54 +0000
Subject: [PATCH] For no good reason, agenda_data took request as first
parameter, remove this as it makes testing harder - Legacy-Id: 6487
---
ietf/iesg/agenda.py | 2 +-
ietf/iesg/views.py | 12 ++++++------
ietf/secr/telechat/views.py | 16 ++++++++--------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ietf/iesg/agenda.py b/ietf/iesg/agenda.py
index 48a57483a..84e737c0e 100644
--- a/ietf/iesg/agenda.py
+++ b/ietf/iesg/agenda.py
@@ -203,7 +203,7 @@ def fill_in_agenda_management_issues(date, sections):
for i, item in enumerate(TelechatAgendaItem.objects.filter(type=3).order_by('id'), start=1):
sections[s % i] = { "title": item.title, "text": item.text }
-def agenda_data(request, date=None):
+def agenda_data(date=None):
"""Return a dict with the different IESG telechat agenda components."""
date = get_agenda_date(date)
sections = agenda_sections()
diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py
index 9669b70f6..85796ab40 100644
--- a/ietf/iesg/views.py
+++ b/ietf/iesg/views.py
@@ -84,7 +84,7 @@ def review_decisions(request, year=None):
context_instance=RequestContext(request))
def agenda_json(request, date=None):
- data = agenda_data(request, date)
+ data = agenda_data(date)
res = {
"telechat-date": str(data["date"]),
@@ -171,7 +171,7 @@ def agenda_json(request, date=None):
return HttpResponse(json.dumps(res, indent=2), mimetype='text/plain')
def agenda(request, date=None):
- data = agenda_data(request, date)
+ data = agenda_data(date)
if has_role(request.user, ["Area Director", "IAB Chair", "Secretariat"]):
data["sections"]["1.1"]["title"] = data["sections"]["1.1"]["title"].replace("Roll Call", '<a href="https://www.ietf.org/iesg/internal/rollcall.txt">Roll Call</a>')
@@ -184,14 +184,14 @@ def agenda(request, date=None):
}, context_instance=RequestContext(request))
def agenda_txt(request, date=None):
- data = agenda_data(request, date)
+ data = agenda_data(date)
return render_to_response("iesg/agenda.txt", {
"date": data["date"],
"sections": sorted(data["sections"].iteritems()),
}, context_instance=RequestContext(request), mimetype="text/plain")
def agenda_scribe_template(request, date=None):
- data = agenda_data(request, date)
+ data = agenda_data(date)
sections = sorted((num, section) for num, section in data["sections"].iteritems() if "2" <= num < "4")
appendix_docs = []
for num, section in sections:
@@ -208,7 +208,7 @@ def agenda_scribe_template(request, date=None):
def agenda_moderator_package(request, date=None):
"""Output telechat agenda with one page per section, with each
document in its own section."""
- data = agenda_data(request, date)
+ data = agenda_data(date)
def leaf_section(num, section):
return not (num == "1"
@@ -255,7 +255,7 @@ def agenda_moderator_package(request, date=None):
@role_required('Area Director', 'Secretariat')
def agenda_package(request, date=None):
- data = agenda_data(request, date)
+ data = agenda_data(date)
return render_to_response("iesg/agenda_package.txt", {
"date": data["date"],
"sections": sorted(data["sections"].iteritems()),
diff --git a/ietf/secr/telechat/views.py b/ietf/secr/telechat/views.py
index 3413d3c46..f55462a48 100644
--- a/ietf/secr/telechat/views.py
+++ b/ietf/secr/telechat/views.py
@@ -35,7 +35,7 @@ active_ballot_positions: takes one argument, doc. returns a dictionary with a k
NOTE: this function has been deprecated as of Datatracker 4.34. Should now use methods on the Document.
For example: doc.active_ballot().active_ad_positions()
-agenda_data: takes a request object and a date string in the format YYYY-MM-DD.
+agenda_data: takes a date string in the format YYYY-MM-DD.
'''
# -------------------------------------------------
@@ -125,7 +125,7 @@ def get_first_doc(agenda):
# -------------------------------------------------
def bash(request, date):
- agenda = agenda_data(request, date=date)
+ agenda = agenda_data(date=date)
return render_to_response('telechat/bash.html', {
'agenda': agenda,
@@ -139,7 +139,7 @@ def doc(request, date):
displays the message "No Documents"
'''
- agenda = agenda_data(request, date=date)
+ agenda = agenda_data(date=date)
doc = get_first_doc(agenda)
if doc:
url = reverse('telechat_doc_detail', kwargs={'date':date,'name':doc.name})
@@ -193,7 +193,7 @@ def doc_detail(request, date, name):
'substate':tag}
BallotFormset = formset_factory(BallotForm, extra=0)
- agenda = agenda_data(request, date=date)
+ agenda = agenda_data(date=date)
header = get_section_header(doc, agenda)
# nav button logic
@@ -310,7 +310,7 @@ def doc_navigate(request, date, name, nav):
The view retrieves the appropriate document and redirects to the doc view.
'''
doc = get_object_or_404(Document, docalias__name=name)
- agenda = agenda_data(request, date=date)
+ agenda = agenda_data(date=date)
target = name
docs = get_doc_list(agenda)
@@ -348,7 +348,7 @@ def management(request, date):
This view displays management issues and lets the user update the status
'''
- agenda = agenda_data(request, date=date)
+ agenda = agenda_data(date=date)
issues = TelechatAgendaItem.objects.filter(type=3).order_by('id')
return render_to_response('telechat/management.html', {
@@ -372,7 +372,7 @@ def minutes(request, date):
pa_docs = [ d for d in docs if d.intended_std_level.slug not in ('inf','exp','hist') ]
da_docs = [ d for d in docs if d.intended_std_level.slug in ('inf','exp','hist') ]
- agenda = agenda_data(request, date=date)
+ agenda = agenda_data(date=date)
# FIXME: this doesn't show other documents
@@ -400,7 +400,7 @@ def new(request):
def roll_call(request, date):
- agenda = agenda_data(request, date=date)
+ agenda = agenda_data(date=date)
ads = Person.objects.filter(role__name='ad', role__group__state="active")
sorted_ads = sorted(ads, key = lambda a: a.name_parts()[3])