make sure that site_base_url has not got a trailing /, as that is harder to deal with in JS

 - Legacy-Id: 6330

Author: mcr

r6328/ietf/meeting/helpers.py

@@ -126,6 +126,16 @@ def scheduledsessions_by_area(self):
     def slot_decor(self):
         return self.timeslot.slot_decor
 
+def build_url_pair(request, meeting):
+    meeting_base_url = request.build_absolute_uri(meeting.base_url())
+    site_base_url    = request.build_absolute_uri('/')
+
+    # remove trailing / from site_base_url.
+    if site_base_url[-1:]=='/':
+        site_base_url = site_base_url[:-1]
+
+    return site_base_url, meeting_base_url
+
 def get_ntimeslots_from_ss(agenda, scheduledsessions):
     ntimeslots = []
     time_seen = set()

r6328/ietf/meeting/views.py

@@ -40,7 +40,7 @@
 from ietf.meeting.models import Schedule, ScheduledSession, Room
 from ietf.group.models import Group
 
-from ietf.meeting.helpers import NamedTimeSlot, get_ntimeslots_from_ss
+from ietf.meeting.helpers import NamedTimeSlot, get_ntimeslots_from_ss, build_url_pair
 from ietf.meeting.helpers import get_ntimeslots_from_agenda, agenda_info
 from ietf.meeting.helpers import get_areas, get_area_list_from_sessions, get_pseudo_areas
 from ietf.meeting.helpers import build_all_agenda_slices, get_wg_name_list
@@ -239,8 +239,7 @@ def edit_timeslots(request, num=None):
 
     time_slices,date_slices,slots = meeting.build_timeslices()
 
-    meeting_base_url = request.build_absolute_uri(meeting.base_url())
-    site_base_url =request.build_absolute_uri('/')
+    site_base_url, meeting_base_url = build_url_pair(request, meeting)
     rooms = meeting.room_set.order_by("capacity")
     rooms = rooms.all()
 
@@ -288,8 +287,7 @@ def edit_agenda(request, num=None, schedule_name=None):
     schedule = get_schedule(meeting, schedule_name)
     #sys.stdout.write("2 requestor: %u for sched owned by: %u \n" % ( requestor.id, schedule.owner.id ))
 
-    meeting_base_url = request.build_absolute_uri(meeting.base_url())
-    site_base_url =request.build_absolute_uri('/')
+    site_base_url, meeting_base_url = build_url_pair(request, meeting)
     rooms = meeting.room_set.order_by("capacity")
     rooms = rooms.all()
     saveas = SaveAsForm()