Summit

Merge lp:~cjohnston/summit/998264 into lp:summit

  1. 998264
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 398
Merged at revision: 410
Proposed branch: lp:~cjohnston/summit/998264
Merge into: lp:summit
Diff against target: 22 lines (+4/-1)
2 files modified
summit/linaro_settings.py (+3/-0)
summit/schedule/models/summitmodel.py (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/summit/998264
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+106450@code.launchpad.net

Commit message

Gives MGR same permission that TL has for scheduling.

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/linaro_settings.py'
2--- summit/linaro_settings.py 2012-03-08 03:55:12 +0000
3+++ summit/linaro_settings.py 2012-05-18 19:01:18 +0000
4@@ -25,3 +25,6 @@
5 else:
6 pass
7
8+# Days before the start of the summit when we stop allowing
9+# track leads to edit the schedule
10+TRACK_LEAD_SCHEDULE_BLACKOUT = 0
11
12=== modified file 'summit/schedule/models/summitmodel.py'
13--- summit/schedule/models/summitmodel.py 2012-05-02 20:33:26 +0000
14+++ summit/schedule/models/summitmodel.py 2012-05-18 19:01:18 +0000
15@@ -377,7 +377,7 @@
16 return True
17 if self.is_scheduler(attendee):
18 return True
19- elif self.is_tracklead(attendee) and (self.localize(datetime.utcnow()).date() + timedelta(days=getattr(settings, 'TRACK_LEAD_SCHEDULE_BLACKOUT', 0))) < self.date_start:
20+ elif self.is_tracklead(attendee) or attendee.user in self.managers.all() and (self.localize(datetime.utcnow()).date() + timedelta(days=getattr(settings, 'TRACK_LEAD_SCHEDULE_BLACKOUT', 0))) < self.date_start:
21 return True
22 return False
23

Subscribers

People subscribed via source and target branches