Summit

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

  1. 1050947
  2. Merge into trunk
Proposed by Chris Johnston
Status: Superseded
Proposed branch: lp:~cjohnston/summit/1050947
Merge into: lp:summit
Diff against target: 66 lines (+24/-17)
2 files modified
summit/schedule/views.py (+23/-16)
summit/settings.py (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/summit/1050947
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+124447@code.launchpad.net

This proposal has been superseded by a proposal from 2012-09-14.

Commit message

Removes username from being requested twice.

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

Looks good

review: Approve

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/views.py'
2--- summit/schedule/views.py 2012-08-12 22:32:46 +0000
3+++ summit/schedule/views.py 2012-09-14 15:12:18 +0000
4@@ -24,26 +24,33 @@
5 from django.core.urlresolvers import reverse
6 from django.utils.datastructures import SortedDict
7
8-from summit.schedule.decorators import (summit_required,
9- summit_only_required,
10- summit_attendee_required)
11+from summit.schedule.decorators import (
12+ summit_required,
13+ summit_only_required,
14+ summit_attendee_required
15+)
16
17-from summit.schedule.models import (Summit,
18- Slot,
19- Attendee,
20- Meeting,
21- Track,
22- Room)
23+from summit.schedule.models import (
24+ Summit,
25+ Slot,
26+ Attendee,
27+ Meeting,
28+ Track,
29+ Room,
30+ Participant
31+)
32
33 from summit.schedule.render import schedule_factory, Schedule
34
35-from summit.schedule.forms import (CreateMeeting,
36- OrganizerEditMeeting,
37- ProposeMeeting,
38- EditMeeting,
39- MeetingReview,
40- AttendMeeting,
41- OrganizerChangeAttend)
42+from summit.schedule.forms import (
43+ CreateMeeting,
44+ OrganizerEditMeeting,
45+ ProposeMeeting,
46+ EditMeeting,
47+ MeetingReview,
48+ AttendMeeting,
49+ OrganizerChangeAttend
50+)
51
52 __all__ = (
53 'summit',
54
55=== modified file 'summit/settings.py'
56--- summit/settings.py 2012-09-06 18:04:15 +0000
57+++ summit/settings.py 2012-09-14 15:12:18 +0000
58@@ -28,7 +28,7 @@
59
60 OPENID_STRICT_USERNAMES=True
61 OPENID_FOLLOW_RENAMES=True
62-OPENID_SREG_REQUIRED_FIELDS = ['email', 'nickname']
63+OPENID_SREG_REQUIRED_FIELDS = ['email']
64
65 from common import utils
66 VERSION_STRING = utils.get_summit_version(

Subscribers

People subscribed via source and target branches