Renamed model .url() methods to .json_url() or .base_url(), depending on function. Replaced the use of custom django method request.get_host_protocol() with standard request.build_absolute_uri(). Removed an uncaught Http403 exception. Fixed a typo /venus_addr/venue_addr/. Removed relurl() methods; no longer needed. Removed some debug functions.

 - Legacy-Id: 6309

Author: levkowetz

ietf/group/ajax.py

@@ -16,8 +16,8 @@
 def group_json(request, groupname):
     group = get_object_or_404(Group, acronym=groupname)
 
-    #print "group request is: %s\n" % (request.get_host_protocol())
-    return HttpResponse(json.dumps(group.json_dict(request.get_host_protocol()),
+    #print "group request is: %s\n" % (request.build_absolute_uri('/'))
+    return HttpResponse(json.dumps(group.json_dict(request.build_absolute_uri('/')),
                                    sort_keys=True, indent=2),
                         mimetype="text/json")
 

ietf/group/models.py

@@ -1,5 +1,7 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
+from urlparse import urljoin
+
 from django.db import models
 from django.db.models import Q
 
@@ -8,7 +10,8 @@
 from ietf.group.colors import fg_group_colors, bg_group_colors
 
 import datetime
-
+import debug
+    
 class GroupInfo(models.Model):
     time = models.DateTimeField(default=datetime.datetime.now)
     name = models.CharField(max_length=80)
@@ -88,20 +91,20 @@ def fg_color(self):
     def bg_color(self):
         return bg_group_colors[self.upcase_acronym]
 
-    def url(self, sitefqdn):
-        return "%s/group/%s.json" % (sitefqdn, self.acronym)
+    def json_url(self):
+        return "/group/%s.json" % (self.acronym,)
 
-    def json_dict(self, sitefqdn):
+    def json_dict(self, host_scheme):
         group1= dict()
-        group1['href'] = self.url(sitefqdn)
+        group1['href'] = urljoin(host_scheme, self.json_url())
         group1['acronym'] = self.acronym
         group1['name']    = self.name
         group1['state']   = self.state.slug
         group1['type']    = self.type.slug
-        group1['parent_href']  = self.parent.url(sitefqdn)
+        group1['parent_href']  = urljoin(host_scheme, self.parent.json_url())
         # uncomment when people URL handle is created
         #if self.ad is not None:
-        #    group1['ad_href']      = self.ad.url(sitefqdn)
+        #    group1['ad_href']      = urljoin(host_scheme, self.ad.url())
         group1['list_email'] = self.list_email
         group1['list_subscribe'] = self.list_subscribe
         group1['list_archive'] = self.list_archive

ietf/meeting/ajax.py

@@ -1,3 +1,5 @@
+from urlparse import urljoin
+
 from django.utils import simplejson as json
 from dajaxice.core import dajaxice_functions
 from dajaxice.decorators import dajaxice_register
@@ -8,7 +10,7 @@
 
 from ietf.ietfauth.decorators import group_required, has_role
 from ietf.name.models import TimeSlotTypeName
-from django.http import HttpResponseRedirect, HttpResponse, Http404, QueryDict, Http403
+from django.http import HttpResponseRedirect, HttpResponse, Http404, QueryDict
 
 from ietf.meeting.helpers import get_meeting, get_schedule, get_schedule_by_id, agenda_permissions
 from ietf.meeting.views   import edit_timeslots, edit_agenda
@@ -56,7 +58,7 @@ def readonly(request, meeting_num, schedule_id):
     return json.dumps(
         {'secretariat': secretariat,
          'write_perm':  write_perm,
-         'owner_href':  schedule.owner.url(request.get_host_protocol()),
+         'owner_href':  request.build_absolute_uri(schedule.owner.json_url()),
          'read_only':   read_only})
 
 @group_required('Area Director','Secretariat')
@@ -73,7 +75,7 @@ def update_timeslot(request, schedule_id, session_id, scheduledsession_id=None,
     cansee,canedit = agenda_permissions(meeting, schedule, request.user)
 
     if not canedit:
-        raise Http403
+        #raise Exception("Not permitted")
         return json.dumps({'error':'no permission'})
 
     session_id = int(session_id)
@@ -136,7 +138,7 @@ def update_timeslot_purpose(request, timeslot_id=None, purpose=None):
     timeslot.type = timeslottypename
     timeslot.save()
 
-    return json.dumps(timeslot.json_dict(request.get_host_protocol))
+    return json.dumps(timeslot.json_dict(request.build_absolute_uri('/')))
 
 #############################################################################
 ## ROOM API
@@ -149,7 +151,7 @@ def timeslot_roomlist(request, mtg):
     rooms = mtg.room_set.all()
     json_array=[]
     for room in rooms:
-        json_array.append(room.json_dict(request.get_host_protocol))
+        json_array.append(room.json_dict(request.build_absolute_uri('/')))
     return HttpResponse(json.dumps(json_array),
                         mimetype="application/json")
 
@@ -199,7 +201,7 @@ def timeslot_roomurl(request, num=None, roomid=None):
 
     if request.method == 'GET':
         room = get_object_or_404(meeting.room_set, pk=roomid)
-        return HttpResponse(json.dumps(room.json_dict(request.get_host_protocol())),
+        return HttpResponse(json.dumps(room.json_dict(request.build_absolute_uri('/'))),
                             mimetype="application/json")
     elif request.method == 'PUT':
         return timeslot_updroom(request, meeting)
@@ -216,7 +218,7 @@ def timeslot_slotlist(request, mtg):
     slots = mtg.timeslot_set.all()
     json_array=[]
     for slot in slots:
-        json_array.append(slot.json_dict(request.get_host_protocol()))
+        json_array.append(slot.json_dict(request.build_absolute_uri('/')))
     return HttpResponse(json.dumps(json_array),
                         mimetype="application/json")
 
@@ -267,7 +269,7 @@ def timeslot_sloturl(request, num=None, slotid=None):
 
     if request.method == 'GET':
         slot = get_object_or_404(meeting.timeslot_set, pk=slotid)
-        return HttpResponse(json.dumps(slot.json_dict(request.get_host_protocol())),
+        return HttpResponse(json.dumps(slot.json_dict(request.build_absolute_uri('/'))),
                             mimetype="application/json")
     elif request.method == 'PUT':
         # not yet implemented!
@@ -287,7 +289,7 @@ def agenda_list(request, mtg):
     agendas = mtg.schedule_set.all()
     json_array=[]
     for agenda in agendas:
-        json_array.append(agenda.json_dict(request.get_host_protocol))
+        json_array.append(agenda.json_dict(request.build_absolute_uri('/')))
     return HttpResponse(json.dumps(json_array),
                         mimetype="application/json")
 
@@ -355,7 +357,7 @@ def agenda_update(request, meeting, schedule):
         meeting.save()
 
     if "HTTP_ACCEPT" in request.META and "application/json" in request.META['HTTP_ACCEPT']:
-        return HttpResponse(json.dumps(schedule.json_dict(request.get_host_protocol())),
+        return HttpResponse(json.dumps(schedule.json_dict(request.build_absolute_uri('/'))),
                             mimetype="application/json")
     else:
         return HttpResponseRedirect(
@@ -390,7 +392,7 @@ def agenda_infourl(request, num=None, schedule_name=None):
     #log.debug("results in agenda: %u / %s" % (schedule.id, request.method))
 
     if request.method == 'GET':
-        return HttpResponse(json.dumps(schedule.json_dict(request.get_host_protocol())),
+        return HttpResponse(json.dumps(schedule.json_dict(request.build_absolute_uri('/'))),
                             mimetype="application/json")
     elif request.method == 'PUT':
         return agenda_update(request, meeting, schedule)
@@ -404,7 +406,7 @@ def agenda_infourl(request, num=None, schedule_name=None):
 #############################################################################
 
 def meeting_get(request, meeting):
-    return HttpResponse(json.dumps(meeting.json_dict(request.get_host_protocol()),
+    return HttpResponse(json.dumps(meeting.json_dict(request.build_absolute_uri('/')),
                                 sort_keys=True, indent=2),
                         mimetype="application/json")
 
@@ -458,7 +460,7 @@ def session_json(request, num, sessionid):
     except Session.DoesNotExist:
         return json.dumps({'error':"no such session %s" % sessionid})
 
-    sess1 = session.json_dict(request.get_host_protocol())
+    sess1 = session.json_dict(request.build_absolute_uri('/'))
     return HttpResponse(json.dumps(sess1, sort_keys=True, indent=2),
                         mimetype="application/json")
 
@@ -473,7 +475,7 @@ def session_constraints(request, num, sessionid):
     except Session.DoesNotExist:
         return json.dumps({"error":"no such session"})
 
-    constraint_list = session.constraints_dict(request.get_host_protocol())
+    constraint_list = session.constraints_dict(request.build_absolute_uri('/'))
 
     json_str = json.dumps(constraint_list,
                           sort_keys=True, indent=2),