diff --git a/ietf/meeting/ajax.py b/ietf/meeting/ajax.py index cc51c5a94..f4f95fcc9 100644 --- a/ietf/meeting/ajax.py +++ b/ietf/meeting/ajax.py @@ -470,7 +470,8 @@ def assignments_post(request, meeting, schedule): def assignments_get(request, num, schedule): assignments = schedule.assignments.all() - sess1_dict = [ x.json_dict(request.build_absolute_uri('/')) for x in assignments ] + absolute_url = request.build_absolute_uri('/') + sess1_dict = [ x.json_dict(absolute_url) for x in assignments ] return HttpResponse(json.dumps(sess1_dict, sort_keys=True, indent=2), content_type="application/json") diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index 617c04f4c..df0300370 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -632,13 +632,11 @@ class Schedule(models.Model): # return self.url_edit("") def owner_email(self): - if not hasattr(self, '_cached_owner_email'): - email = self.owner.email_set.all().order_by('primary').first() - if email: - self._cached_owner_email = email.address - else: - self._cached_owner_email = "noemail" - return self._cached_owner_email + email = self.owner.email_set.all().order_by('primary').first() + if email: + return email.address + else: + return "noemail" @property def visible_token(self): diff --git a/ietf/meeting/tests_api.py b/ietf/meeting/tests_api.py index ef6cbaf47..c59ef8a01 100644 --- a/ietf/meeting/tests_api.py +++ b/ietf/meeting/tests_api.py @@ -4,6 +4,8 @@ from urlparse import urlsplit from django.core.urlresolvers import reverse as urlreverse +import debug # pyflakes:ignore + from ietf.group.models import Group from ietf.meeting.models import Schedule, TimeSlot, Session, SchedTimeSessAssignment, Meeting, Constraint from ietf.meeting.test_data import make_meeting_test_data