Summit

Merge lp:~cjohnston/summit/etherpad-breaks-summit into lp:summit

  1. etherpad-breaks-summit
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Michael Hall
Approved revision: 281
Merged at revision: 282
Proposed branch: lp:~cjohnston/summit/etherpad-breaks-summit
Merge into: lp:summit
Diff against target: 12 lines (+1/-1)
1 file modified
summit/schedule/models/summitmodel.py (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/summit/etherpad-breaks-summit
Reviewer Review Type Date Requested Status
Alan Bell (community) Approve
Michael Hall (community) Approve
Review via email: mp+90537@code.launchpad.net

Commit message

Fixes the issue where etherpad SSO breaks summit.

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

Looks good, we shouldn't use verify_exists for anything really

review: Approve
Revision history for this message
Alan Bell (alanbell) wrote :

yes, can be handy to point summit at a pad url that does not exist at the time of entry

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/summitmodel.py'
2--- summit/schedule/models/summitmodel.py 2012-01-27 17:12:23 +0000
3+++ summit/schedule/models/summitmodel.py 2012-01-27 21:45:27 +0000
4@@ -75,7 +75,7 @@
5 title = models.CharField(max_length=100)
6 location = models.CharField(max_length=100, blank=True)
7 description = models.TextField(max_length=2047, blank=True)
8- etherpad = models.URLField(max_length=75, blank=False, default='http://pad.ubuntu.com/', help_text="Enter the URL of the etherpad server you would like to use")
9+ etherpad = models.URLField(verify_exists=False, max_length=75, blank=False, default='http://pad.ubuntu.com/', help_text="Enter the URL of the etherpad server you would like to use")
10 hashtag = models.CharField(max_length=25, blank=True)
11 timezone = models.CharField(max_length=50,
12 choices=[(x, x) for x in pytz.common_timezones])

Subscribers

People subscribed via source and target branches