Summit

Merge lp://staging/~cjohnston/summit/add-all-meetings into lp://staging/summit

  1. add-all-meetings
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 544
Merged at revision: 545
Proposed branch: lp://staging/~cjohnston/summit/add-all-meetings
Merge into: lp://staging/summit
Diff against target: 284 lines (+197/-27)
5 files modified
summit/schedule/templates/schedule/actions.html (+27/-27)
summit/schedule/templates/schedule/all_meetings.html (+135/-0)
summit/schedule/tests/reverse_url.py (+6/-0)
summit/schedule/views.py (+24/-0)
summit/urls.py (+5/-0)
To merge this branch: bzr merge lp://staging/~cjohnston/summit/add-all-meetings
Reviewer Review Type Date Requested Status
Joe Talbott Approve
Chris Johnston Needs Resubmitting
Review via email: mp+163042@code.staging.launchpad.net

Commit message

Creates a page that lists all meetings for an event

To post a comment you must log in.
Revision history for this message
Joe Talbott (joetalbott) wrote :

Nothing jumps out at me. Those loops on L240 and L245 could get ugly if you have a lot of tracks and meetings but I don't thing that's the case right now.

I'm not familiar enough with the codebase to really comment on the templates and CSS stuff.

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

I don't see tracks ever getting too much, but adding meetings in maybe. This code is just duplicated from elsewhere in summit, so it may be worthwhile to look at both of them.

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

I'm going to merge it in, it can be fixed and used for the next UDS however we are running short of time now.

Revision history for this message
Tarmac WebDev (tarmac-webdev) wrote :

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

text conflict in summit/schedule/templates/schedule/actions.html

lp://staging/~cjohnston/summit/add-all-meetings updated
544. By Chris Johnston <email address hidden>

Fixes conflict

Revision history for this message
Chris Johnston (cjohnston) :
review: Needs Resubmitting
Revision history for this message
Joe Talbott (joetalbott) wrote :

Looks good to me.

review: Approve

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