Skip to content

Commit 20c9bc9

Browse files
committed
Reverted one instance of caching, as it seems schedules can change owners.
- Legacy-Id: 12138
1 parent d27fdb9 commit 20c9bc9

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

ietf/meeting/ajax.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,8 @@ def assignments_post(request, meeting, schedule):
470470
def assignments_get(request, num, schedule):
471471
assignments = schedule.assignments.all()
472472

473-
sess1_dict = [ x.json_dict(request.build_absolute_uri('/')) for x in assignments ]
473+
absolute_url = request.build_absolute_uri('/')
474+
sess1_dict = [ x.json_dict(absolute_url) for x in assignments ]
474475
return HttpResponse(json.dumps(sess1_dict, sort_keys=True, indent=2),
475476
content_type="application/json")
476477

ietf/meeting/models.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -632,13 +632,11 @@ def base_url(self):
632632
# return self.url_edit("")
633633

634634
def owner_email(self):
635-
if not hasattr(self, '_cached_owner_email'):
636-
email = self.owner.email_set.all().order_by('primary').first()
637-
if email:
638-
self._cached_owner_email = email.address
639-
else:
640-
self._cached_owner_email = "noemail"
641-
return self._cached_owner_email
635+
email = self.owner.email_set.all().order_by('primary').first()
636+
if email:
637+
return email.address
638+
else:
639+
return "noemail"
642640

643641
@property
644642
def visible_token(self):

ietf/meeting/tests_api.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
from django.core.urlresolvers import reverse as urlreverse
66

7+
import debug # pyflakes:ignore
8+
79
from ietf.group.models import Group
810
from ietf.meeting.models import Schedule, TimeSlot, Session, SchedTimeSessAssignment, Meeting, Constraint
911
from ietf.meeting.test_data import make_meeting_test_data

0 commit comments

Comments
 (0)