Summit

Merge lp://staging/~cjohnston/summit/attendee-from-launchpad into lp://staging/summit

  1. attendee-from-launchpad
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 517
Merged at revision: 516
Proposed branch: lp://staging/~cjohnston/summit/attendee-from-launchpad
Merge into: lp://staging/summit
Diff against target: 398 lines (+332/-9)
4 files modified
summit/schedule/migrations/0028_add_attendee_from_lp.py (+213/-0)
summit/schedule/models/attendeemodel.py (+21/-8)
summit/schedule/models/summitmodel.py (+2/-1)
summit/schedule/tests/summit_model.py (+96/-0)
To merge this branch: bzr merge lp://staging/~cjohnston/summit/attendee-from-launchpad
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+156531@code.staging.launchpad.net

Commit message

Adds from_launchpad field to attendee, and does not override start and end if from_launchpad is false.

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) wrote :

seems straightforward enough to me.

Revision history for this message
Michael Hall (mhall119) wrote :

Looks good

review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :

The attempt to merge lp:~chrisjohnston/summit/attendee-from-launchpad into lp:summit failed. Below is the output from the failed tests.

python: can't open file 'manage.py': [Errno 2] No such file or directory

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches