Merge lp:~mhall119/summit/approved_only_for_scheduling into lp:summit

Proposed by Michael Hall
Status: Merged
Approved by: Chris Johnston
Approved revision: 348
Merged at revision: 348
Proposed branch: lp:~mhall119/summit/approved_only_for_scheduling
Merge into: lp:summit
Diff against target: 12 lines (+1/-1)
1 file modified
summit/schedule/render.py (+1/-1)
To merge this branch: bzr merge lp:~mhall119/summit/approved_only_for_scheduling
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+102368@code.launchpad.net

Commit message

Only make approved meetings available for manual scheduling

Description of the change

Only make approved meetings available for manual scheduling

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'summit/schedule/render.py'
--- summit/schedule/render.py 2012-04-17 01:53:48 +0000
+++ summit/schedule/render.py 2012-04-17 18:36:22 +0000
@@ -294,7 +294,7 @@
294 # When editing, we also need the list of unscheduled meetings294 # When editing, we also need the list of unscheduled meetings
295 self.unscheduled = []295 self.unscheduled = []
296 if self.edit:296 if self.edit:
297 query_parts = []297 query_parts = [Q(approved='APPROVED')]
298 # Don't show scheduled meetings298 # Don't show scheduled meetings
299 query_parts.append(Q(agenda__isnull=True))299 query_parts.append(Q(agenda__isnull=True))
300 if self.room:300 if self.room:

Subscribers

People subscribed via source and target branches