Make MEDIA_URL end in slash

 - Legacy-Id: 6874

Author: OleLaursen

ietf/doc/models.py

@@ -200,9 +200,9 @@ def get_absolute_url(self):
             else:
                 filename = self.external_url
             if meeting.type_id == 'ietf':
-                url = '%s/proceedings/%s/%s/%s' % (settings.MEDIA_URL,meeting.number,self.type_id,filename)
+                url = '%sproceedings/%s/%s/%s' % (settings.MEDIA_URL,meeting.number,self.type_id,filename)
             elif meeting.type_id == 'interim':
-                url = "%s/proceedings/interim/%s/%s/%s/%s" % (
+                url = "%sproceedings/interim/%s/%s/%s/%s" % (
                     settings.MEDIA_URL,
                     meeting.date.strftime('%Y/%m/%d'),
                     session.group.acronym,

ietf/secr/proceedings/models.py

@@ -52,7 +52,7 @@ def get_proceedings_url(self, group=None):
         If the proceedings file doesn't exist return empty string.  For use in templates.
         '''
         if os.path.exists(self.get_proceedings_path()):
-            url = "%s/proceedings/interim/%s/%s/proceedings.html" % (
+            url = "%sproceedings/interim/%s/%s/proceedings.html" % (
                 settings.MEDIA_URL,
                 self.date.strftime('%Y/%m/%d'),
                 self.group().acronym)
@@ -70,4 +70,4 @@ class Registration(models.Model):
     def __unicode__(self):
         return "%s %s" % (fname, lname)
     class Meta:
-        db_table = 'registrations'
+        db_table = 'registrations'

ietf/secr/proceedings/proc_utils.py

@@ -207,9 +207,9 @@ def create_proceedings(meeting, group, is_final=False):
 
     meeting_root = get_upload_root(meeting)
     if meeting.type.slug == 'ietf':
-        url_root = "%s/proceedings/%s/" % (settings.MEDIA_URL,meeting.number)
+        url_root = "%sproceedings/%s/" % (settings.MEDIA_URL,meeting.number)
     else:
-        url_root = "%s/proceedings/interim/%s/%s/" % (
+        url_root = "%sproceedings/interim/%s/%s/" % (
             settings.MEDIA_URL,
             meeting.date.strftime('%Y/%m/%d'),
             group.acronym)
@@ -338,7 +338,7 @@ def gen_areas(context):
 
     # append proceedings URL
     for group in gmet + gnot:
-        group.proceedings_url = "%s/proceedings/%s/%s.html" % (settings.MEDIA_URL,meeting.number,group.acronym)
+        group.proceedings_url = "%sproceedings/%s/%s.html" % (settings.MEDIA_URL,meeting.number,group.acronym)
 
     for (counter,area) in enumerate(context['areas'], start=1):
         groups_met = {'wg':filter(lambda a: a.parent==area and a.state.slug not in ('bof','bof-conc') and a.type_id=='wg',gmet),
@@ -514,7 +514,7 @@ def gen_research(context):
 
     # append proceedings URL
     for group in groups:
-        group.proceedings_url = "%s/proceedings/%s/%s.html" % (settings.MEDIA_URL,meeting.number,group.acronym)
+        group.proceedings_url = "%sproceedings/%s/%s.html" % (settings.MEDIA_URL,meeting.number,group.acronym)
 
     html = render_to_response('proceedings/rg_irtf.html',{
         'meeting': meeting,

ietf/secr/proceedings/views.py

@@ -150,12 +150,12 @@ def get_proceedings_path(meeting,group):
 
 def get_proceedings_url(meeting,group=None):
     if meeting.type_id == 'ietf':
-        url = "%s/proceedings/%s/" % (settings.MEDIA_URL,meeting.number)
+        url = "%sproceedings/%s/" % (settings.MEDIA_URL,meeting.number)
         if group:
             url = url + "%s.html" % group.acronym
 
     elif meeting.type_id == 'interim':
-        url = "%s/proceedings/interim/%s/%s/proceedings.html" % (
+        url = "%sproceedings/interim/%s/%s/proceedings.html" % (
             settings.MEDIA_URL,
             meeting.date.strftime('%Y/%m/%d'),
             group.acronym)

ietf/secr/templates/includes/proceedings_functions.html

@@ -21,6 +21,6 @@
           <p>Use this to generate the progress report for the plenary.</p>
           <ul class="none">
             <li><button onclick="window.location='{% url proceedings_progress_report meeting_num=meeting.number %}'">Generate Progress Report</button>
-            &nbsp;&nbsp;<a href="{{ MEDIA_URL }}/proceedings/{{ meeting.number }}/progress-report.html">Progress Report</a>
+            &nbsp;&nbsp;<a href="{{ MEDIA_URL }}proceedings/{{ meeting.number }}/progress-report.html">Progress Report</a>
             </li>
-          </ul>
+          </ul>

ietf/secr/templates/proceedings/convert.html

@@ -31,7 +31,7 @@ <h2>Proceedings - PPT/DOC Files in Queue</h2>
         <tr class = "{% cycle 'row1' 'row2' %}">
           <td>{{ slide.slide_name }}</td>
           <td>{{ slide.group_name }}</td>
-          <td><a href="{{ MEDIA_URL }}/proceedings/{{ meeting.meeting_num }}/slides/{{ slide.filename }}">Download</a></td>
+          <td><a href="{{ MEDIA_URL }}proceedings/{{ meeting.meeting_num }}/slides/{{ slide.filename }}">Download</a></td>
           <td><a href="{% url sec.proceedings.views.upload_presentation id=meeting.meeting_num, slide_id=slide.id %}">Upload</a></td>
         </tr>
       {% endfor %}

ietf/settings.py

@@ -88,8 +88,7 @@
 MEDIA_ROOT = BASE_DIR + "/../static/"
 
 # URL that handles the media served from MEDIA_ROOT.
-# Example: "http://media.lawrence.com"
-MEDIA_URL = 'http://www.ietf.org'
+MEDIA_URL = 'http://www.ietf.org/'
 
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a
 # trailing slash.