Summit

Merge lp:~mhall119/summit/preserve-required into lp:summit

  1. preserve-required
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 492
Merged at revision: 492
Proposed branch: lp:~mhall119/summit/preserve-required
Merge into: lp:summit
Diff against target: 19 lines (+5/-4)
1 file modified
summit/schedule/models/meetingmodel.py (+5/-4)
To merge this branch: bzr merge lp:~mhall119/summit/preserve-required
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+150833@code.launchpad.net

This proposal supersedes a proposal from 2013-02-27.

Commit message

Preserve required attendees

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) wrote : Posted in a previous version of this proposal

Conflicts need to be fixed please.

review: Needs Fixing
Revision history for this message
Chris Johnston (cjohnston) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Chris Johnston (cjohnston) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Tarmac WebDev (tarmac-webdev) wrote : Posted in a previous version of this proposal

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message
Chris Johnston (cjohnston) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Tarmac WebDev (tarmac-webdev) wrote : Posted in a previous version of this proposal

Attempt to merge into lp:summit failed due to conflicts:

text conflict in summit/schedule/tests/tests.py
text conflict in summit/schedule/views.py

lp:~mhall119/summit/preserve-required updated
492. By Michael Hall

Once again, merge from trunk and fix conflicts

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
1=== modified file 'summit/schedule/models/meetingmodel.py'
2--- summit/schedule/models/meetingmodel.py 2013-02-26 20:00:45 +0000
3+++ summit/schedule/models/meetingmodel.py 2013-02-27 18:02:21 +0000
4@@ -497,10 +497,11 @@
5 )[0]
6
7 participant.from_launchpad = True
8- if required:
9- participant.participation = 'INTERESTED'
10- else:
11- participant.participation = 'ATTENDING'
12+ if not participant.participation == 'REQUIRED':
13+ if required:
14+ participant.participation = 'INTERESTED'
15+ else:
16+ participant.participation = 'ATTENDING'
17 participant.save()
18 except ObjectDoesNotExist:
19 pass

Subscribers

People subscribed via source and target branches