Reverted one instance of caching, as it seems schedules can change owners.
- Legacy-Id: 12138
This commit is contained in:
parent
d27fdb976b
commit
20c9bc9e62
|
@ -470,7 +470,8 @@ def assignments_post(request, meeting, schedule):
|
||||||
def assignments_get(request, num, schedule):
|
def assignments_get(request, num, schedule):
|
||||||
assignments = schedule.assignments.all()
|
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),
|
return HttpResponse(json.dumps(sess1_dict, sort_keys=True, indent=2),
|
||||||
content_type="application/json")
|
content_type="application/json")
|
||||||
|
|
||||||
|
|
|
@ -632,13 +632,11 @@ class Schedule(models.Model):
|
||||||
# return self.url_edit("")
|
# return self.url_edit("")
|
||||||
|
|
||||||
def owner_email(self):
|
def owner_email(self):
|
||||||
if not hasattr(self, '_cached_owner_email'):
|
email = self.owner.email_set.all().order_by('primary').first()
|
||||||
email = self.owner.email_set.all().order_by('primary').first()
|
if email:
|
||||||
if email:
|
return email.address
|
||||||
self._cached_owner_email = email.address
|
else:
|
||||||
else:
|
return "noemail"
|
||||||
self._cached_owner_email = "noemail"
|
|
||||||
return self._cached_owner_email
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def visible_token(self):
|
def visible_token(self):
|
||||||
|
|
|
@ -4,6 +4,8 @@ from urlparse import urlsplit
|
||||||
|
|
||||||
from django.core.urlresolvers import reverse as urlreverse
|
from django.core.urlresolvers import reverse as urlreverse
|
||||||
|
|
||||||
|
import debug # pyflakes:ignore
|
||||||
|
|
||||||
from ietf.group.models import Group
|
from ietf.group.models import Group
|
||||||
from ietf.meeting.models import Schedule, TimeSlot, Session, SchedTimeSessAssignment, Meeting, Constraint
|
from ietf.meeting.models import Schedule, TimeSlot, Session, SchedTimeSessAssignment, Meeting, Constraint
|
||||||
from ietf.meeting.test_data import make_meeting_test_data
|
from ietf.meeting.test_data import make_meeting_test_data
|
||||||
|
|
Loading…
Reference in a new issue