Skip to content

Commit 0819db1

Browse files
author
Matthijs Mekking
committed
url prefix for slides
- Legacy-Id: 2407
1 parent 2a00677 commit 0819db1

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

matthijs/ietf/settings.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,9 @@
163163
IESG_MINUTES_FILE = '/a/www/www6/iesg/internal/minutes.txt'
164164
IESG_WG_EVALUATION_DIR = "/a/www/www6/iesg/evaluation"
165165

166+
# Override this in settings_local.py if needed
167+
AGENDA_URL = 'http://www.ietf.org/proceedings/'
168+
166169
# Override this in settings_local.py if needed
167170
CACHE_MIDDLEWARE_SECONDS = 300
168171
CACHE_MIDDLEWARE_KEY_PREFIX = ''

matthijs/ietf/wginfo/views.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,17 +141,18 @@ def wg_meeting(request, acronym=None, num=None):
141141
else:
142142
meeting = meeting_info(num)
143143

144-
prefix = settings.AGENDA_PATH
144+
agenda_prefix = settings.AGENDA_PATH
145+
url_prefix = settings.AGENDA_URL
145146

146147
slides = session.slides()
147148
for slide in slides:
148149
slide.filename = slide.file_loc()
149-
# if slide.filename and prefix:
150-
# slide.filename = prefix + slide.file_loc()
150+
if slide.filename and url_prefix:
151+
slide.filename = url_prefix + slide.file_loc()
151152

152153
agenda_file = session.agenda_file()
153-
if agenda_file and prefix:
154-
agenda_file = prefix + agenda_file
154+
if agenda_file and agenda_prefix:
155+
agenda_file = agenda_prefix + agenda_file
155156
agenda_text = wg_agenda_text(agenda_file)
156157
agenda_type = "text";
157158
if agenda_file[-5:].lower() == ".html":
@@ -160,8 +161,8 @@ def wg_meeting(request, acronym=None, num=None):
160161
agenda_type = "html";
161162

162163
minutes_file = session.minute_file()
163-
if minutes_file and prefix:
164-
minutes_file = prefix + minutes_file
164+
if minutes_file and agenda_prefix:
165+
minutes_file = agenda_prefix + minutes_file
165166
minutes_text = wg_minutes_text(minutes_file)
166167
minutes_type = "text";
167168
if minutes_file[-5:] == ".html":

0 commit comments

Comments
 (0)