Merge lp:~cjohnston/summit/update-django-1-4 into lp:summit

[Chris Johnston]

Updates Summit to work with Django 1.4.x... This will allow much improvement for the vUDS events.

[lp:~cjohnston/summit/update-django-1-4]

506. By Chris Johnston on 2013-03-09

Fixes conflict

[Michael Hall (mhall119)]

4 test failures: http://paste.ubuntu.com/5615251/

review: Needs Fixing

[Michael Hall (mhall119)]

Approving because the next branch will fix any lingering test failures

review: Approve

=== modified file 'requirements.txt'
--- requirements.txt	2013-02-20 13:57:06 +0000
+++ requirements.txt	2013-03-09 05:16:21 +0000
@@ -6,8 +6,8 @@
 #       include patches applied by the package maintainers.
 #
 
-Django==1.3.2
-South==0.7.3
+Django==1.4.5
+South==0.7.5
 bzr>=2.4b4
 distribute==0.6.10
 django-openid-auth==0.4

=== modified file 'setup.py'
--- setup.py	2012-03-31 02:50:39 +0000
+++ setup.py	2013-03-09 05:16:21 +0000
@@ -41,7 +41,7 @@
     packages = packages,
     zip_safe = False,
     install_requires = [
-        "Django==1.3.1",
+        "Django==1.4.5",
         "psycopg2>=2.0.9",
         "pytz",
         "BeautifulSoup",

=== modified file 'summit/common/management/commands/lpupdate.py'
--- summit/common/management/commands/lpupdate.py	2013-02-26 19:31:21 +0000
+++ summit/common/management/commands/lpupdate.py	2013-03-09 05:16:21 +0000
@@ -26,12 +26,30 @@
 
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
-        make_option("-s", "--slots", dest="slots",
-            help="Number of slots an imported meeting needs", type=int, default=1),
-        make_option("-A", "--no-attendees", dest="skip_attendees", action="store_true",
-            help="Don't import Attendee data", default=False),
-        make_option("-M", "--no-meetings", dest="skip_meetings", action="store_true",
-            help="Don't import Meeting data", default=False),
+        make_option(
+            "-s",
+            "--slots",
+            dest="slots",
+            help="Number of slots an imported meeting needs",
+            type=int,
+            default=1
+        ),
+        make_option(
+            "-A",
+            "--no-attendees",
+            dest="skip_attendees",
+            action="store_true",
+            help="Don't import Attendee data",
+            default=False
+        ),
+        make_option(
+            "-M",
+            "--no-meetings",
+            dest="skip_meetings",
+            action="store_true",
+            help="Don't import Meeting data",
+            default=False
+        ),
     )
 
     def handle(self, summit='', *args, **options):

=== modified file 'summit/schedule/admin/attendeeadmin.py'
--- summit/schedule/admin/attendeeadmin.py	2013-02-26 19:31:21 +0000
+++ summit/schedule/admin/attendeeadmin.py	2013-03-09 05:16:21 +0000
@@ -31,23 +31,40 @@
     list_display = ('summit', 'user')
     list_display_links = ('user', )
     list_filter = ('summit', )
-    search_fields = ('user__username', 'user__first_name', 'user__last_name',
-                     'user__email')
+    search_fields = (
+        'user__username',
+        'user__first_name',
+        'user__last_name',
+        'user__email'
+    )
     inlines = (AttendeeBusyInline, )
 
 
 class ParticipantAdmin(admin.ModelAdmin):
     list_display = ('meeting', 'attendee', 'participation')
     list_display_links = ('attendee', )
-    search_fields = ('attendee__user__username', 'attendee__user__first_name', 'attendee__user__last_name',
-                     'attendee__user__email', 'meeting__name', 'meeting__title')
+    search_fields = (
+        'attendee__user__username',
+        'attendee__user__first_name',
+        'attendee__user__last_name',
+        'attendee__user__email',
+        'meeting__name',
+        'meeting__title'
+    )
 
     def formfield_for_foreignkey(self, db_field, request, **kwargs):
         if db_field.name == "meeting":
             kwargs["queryset"] = Meeting.objects.order_by('name')
         if db_field.name == "attendee":
             kwargs["queryset"] = Attendee.objects.order_by('user__username')
-        return super(ParticipantAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
+        return super(
+            ParticipantAdmin,
+            self
+        ).formfield_for_foreignkey(
+            db_field,
+            request,
+            **kwargs
+        )
 
 
 admin.site.register(Attendee, AttendeeAdmin)

=== modified file 'summit/schedule/admin/crewadmin.py'
--- summit/schedule/admin/crewadmin.py	2013-02-26 19:31:21 +0000
+++ summit/schedule/admin/crewadmin.py	2013-03-09 05:16:21 +0000
@@ -26,7 +26,11 @@
     list_display = ('attendee', 'date_utc')
     list_display_links = ('attendee', 'date_utc')
     list_filter = ('date_utc',)
-    search_fields = ('attendee__user__username', 'attendee__user__first_name',
-        'attendee__user__last_name', 'attendee__user__email')
+    search_fields = (
+        'attendee__user__username',
+        'attendee__user__first_name',
+        'attendee__user__last_name',
+        'attendee__user__email'
+    )
 
 admin.site.register(Crew, CrewAdmin)

=== modified file 'summit/schedule/admin/leadadmin.py'
--- summit/schedule/admin/leadadmin.py	2013-02-26 19:31:21 +0000
+++ summit/schedule/admin/leadadmin.py	2013-03-09 05:16:21 +0000
@@ -26,7 +26,11 @@
     list_display = ('summit', 'track', 'lead')
     list_display_links = ('summit', 'track')
     list_filter = ('summit', 'track')
-    search_fields = ('attendee__user__username', 'attendee__user__first_name',
-        'attendee__user__last_name', 'attendee__user__email')
+    search_fields = (
+        'attendee__user__username',
+        'attendee__user__first_name',
+        'attendee__user__last_name',
+        'attendee__user__email'
+    )
 
 admin.site.register(Lead, LeadAdmin)

=== modified file 'summit/schedule/admin/meetingadmin.py'
--- summit/schedule/admin/meetingadmin.py	2013-02-26 19:31:21 +0000
+++ summit/schedule/admin/meetingadmin.py	2013-03-09 05:16:21 +0000
@@ -15,7 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django import forms
-from django.conf import settings
 from django.contrib import admin
 from django.forms.util import flatatt
 from django.utils.encoding import force_unicode
@@ -49,20 +48,25 @@
     model = Participant
     template = 'admin/edit_inline/collapsed_tabular.html'
 
-    def _media(self):
-        media = super(ParticipantInline, self)._media()
-        media.add_js(('%sjs/collapse.min.js'
-                      % settings.ADMIN_MEDIA_PREFIX, ))
-        return media
-    media = property(_media)
-
     def get_formset(self, request, obj=None, **kwargs):
         fs = super(ParticipantInline, self).get_formset(request, obj, **kwargs)
         if fs and obj:
-            fs = super(ParticipantInline, self).get_formset(request, obj, **kwargs)
-            fs.form.base_fields['attendee'].queryset = fs.form.base_fields['attendee'].queryset.filter(summit=obj.summit)
+            fs = super(
+                ParticipantInline,
+                self
+            ).get_formset(
+                request,
+                obj,
+                **kwargs
+            )
+            fs.form.base_fields[
+                'attendee'
+            ].queryset = fs.form.base_fields[
+                'attendee'
+            ].queryset.filter(summit=obj.summit)
         return fs
 
+
 class MeetingAdminForm(forms.ModelForm):
     drafter = forms.CharField(required=False, widget=AttendeeInput)
     assignee = forms.CharField(required=False, widget=AttendeeInput)
@@ -131,6 +135,7 @@
         meeting.share()
 share.short_description = "Share Meetings (Private only)"
 
+
 class MeetingAdmin(admin.ModelAdmin):
     list_display = (
         'summit',
@@ -175,9 +180,11 @@
             ),
         }),
         ("Hangout details", {
+            'classes': ('collapse', ),
             'fields': ('hangout_url', 'broadcast_url',)
         }),
         ("References", {
+            'classes': ('collapse', ),
             'fields': (
                 'spec_url',
                 'launchpad_blueprint_id',

=== modified file 'summit/schedule/admin/roomadmin.py'
--- summit/schedule/admin/roomadmin.py	2013-02-26 19:31:21 +0000
+++ summit/schedule/admin/roomadmin.py	2013-03-09 05:16:21 +0000
@@ -36,8 +36,17 @@
 
     fieldsets = (
         (None, {
-            'fields': ('summit', 'name', 'title', 'type', 'size', 'tracks',
-                       'icecast_url', 'irc_channel', 'has_dial_in'),
+            'fields': (
+                'summit',
+                'name',
+                'title',
+                'type',
+                'size',
+                'tracks',
+                'icecast_url',
+                'irc_channel',
+                'has_dial_in'
+            ),
         }),
         ("Availability", {
             'fields': ('start_utc', 'end_utc'),

=== modified file 'summit/schedule/admin/summitadmin.py'
--- summit/schedule/admin/summitadmin.py	2013-02-26 19:31:21 +0000
+++ summit/schedule/admin/summitadmin.py	2013-03-09 05:16:21 +0000
@@ -34,12 +34,10 @@
 
     template = 'admin/edit_inline/collapsed_tabular.html'
 
-    def _media(self):
-        media = super(TrackInline, self)._media()
-        media.add_js(('%sjs/collapse.min.js'
-                      % settings.ADMIN_MEDIA_PREFIX, ))
-        return media
-    media = property(_media)
+    class Media:
+        media_url = getattr(settings, 'STATIC_URL', '/static/')
+        js = [media_url+'admin/js/collapse.min.js', ]
+
 
 class SprintInline(admin.TabularInline):
     model = SummitSprint
@@ -47,12 +45,9 @@
 
     template = 'admin/edit_inline/collapsed_tabular.html'
 
-    def _media(self):
-        media = super(SprintInline, self)._media()
-        media.add_js(('%sjs/collapse.min.js'
-                      % settings.ADMIN_MEDIA_PREFIX, ))
-        return media
-    media = property(_media)
+    class Media:
+        media_url = getattr(settings, 'STATIC_URL', '/static/')
+        js = [media_url+'admin/js/collapse.min.js', ]
 
 
 class SummitAdmin(admin.ModelAdmin):

=== modified file 'summit/schedule/forms.py'
--- summit/schedule/forms.py	2013-03-05 22:42:44 +0000
+++ summit/schedule/forms.py	2013-03-09 05:16:21 +0000
@@ -202,6 +202,7 @@
 YOUTUBE_PAGE_URL = re.compile(r'https?:\/\/www.youtube.com\/watch\?v=(?P<youtube_id>[^&]*).*')
 YOUTUBE_SHORT_URL = re.compile(r'https?:\/\/youtu.be\/(?P<youtube_id>[^\?]*).*')
 
+
 class YouTubeEmbedURL(forms.URLField):
 
     def clean(self, value):
@@ -218,6 +219,7 @@
             pass
         return value
 
+
 class EditMeetingHangout(forms.ModelForm, RenderableMixin):
     class Meta:
         model = Meeting

=== modified file 'summit/schedule/models/attendeemodel.py'
--- summit/schedule/models/attendeemodel.py	2013-02-26 19:31:21 +0000
+++ summit/schedule/models/attendeemodel.py	2013-03-09 05:16:21 +0000
@@ -35,8 +35,9 @@
 class Attendee(models.Model):
     summit = models.ForeignKey(Summit)
     user = models.ForeignKey(User)
-    start_utc = models.DateTimeField(db_column='start',
-                                     verbose_name="Start (UTC)")
+    start_utc = models.DateTimeField(
+        db_column='start',
+        verbose_name="Start (UTC)")
     end_utc = models.DateTimeField(db_column='end',
                                    verbose_name="End (UTC)")
     # FIXME restrict to tracks that match summit
@@ -112,9 +113,11 @@
         # login; but maybe they never will (logic copied from openid auth)
         fullname = elem.get("displayname", '')
         if fullname:
-            if ' ' in fullname:
-                self.user.first_name, self.user.last_name \
-                    = fullname.rsplit(None, 1)
+            #if ' ' in fullname:
+            fullname = fullname.strip()
+            split_names = fullname.rsplit(None, 1)
+            if len(split_names) == 2:
+                self.user.first_name, self.user.last_name = split_names
                 self.user.first_name = self.user.first_name[:30]
                 self.user.last_name = self.user.last_name[:30]
             else:

=== modified file 'summit/settings.py'
--- summit/settings.py	2013-03-09 05:00:49 +0000
+++ summit/settings.py	2013-03-09 05:16:21 +0000
@@ -25,10 +25,6 @@
 
 SERVE_STATIC = True
 
-OPENID_STRICT_USERNAMES = True
-OPENID_FOLLOW_RENAMES = True
-OPENID_SREG_REQUIRED_FIELDS = ['email']
-
 SITE_ROOT = 'http://summit.ubuntu.com'
 
 ADMINS = (
@@ -55,14 +51,10 @@
 # system time zone.
 TIME_ZONE = 'UTC'
 
-# Language code for this installation. All choices can be found here:
-# http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en-us'
 
 SITE_ID = 1
 
-# If you set this to False, Django will make some optimizations so as not
-# to load the internationalization machinery.
 USE_I18N = False
 
 # Absolute path to the directory that holds media.
@@ -80,14 +72,11 @@
 # URL Location for static media
 STATIC_URL = "/static/"
 
-# Make this unique, and don't share it with anybody.
 SECRET_KEY = ''
 
-# List of callables that know how to import templates from various sources.
 TEMPLATE_LOADERS = (
     'django.template.loaders.filesystem.Loader',
     'django.template.loaders.app_directories.Loader',
-#     'django.template.loaders.eggs.load_template_source',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -96,6 +85,7 @@
     "django.core.context_processors.i18n",
     "django.core.context_processors.media",
     "django.core.context_processors.request",
+    "django.contrib.messages.context_processors.messages",
     "common.context_processors.next_summit",
     "common.context_processors.login_redirect",
     "common.context_processors.url_base",
@@ -110,14 +100,12 @@
     'django.middleware.locale.LocaleMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
 )
 
 ROOT_URLCONF = 'summit.urls'
 
 TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
     os.path.join(PROJECT_PATH, 'templates'),
     os.path.join(PROJECT_PATH, 'common/templates'),
 )
@@ -125,6 +113,7 @@
 INSTALLED_APPS = [
     'django.contrib.auth',
     'django.contrib.contenttypes',
+    'django.contrib.messages',
     'django.contrib.sessions',
     'django_openid_auth',
     'django.contrib.admin',
@@ -141,18 +130,13 @@
     'django.contrib.auth.backends.ModelBackend',
 )
 
-# Should users be created when new OpenIDs are used to log in?
+# OPENID Related settings
+OPENID_STRICT_USERNAMES = True
+OPENID_FOLLOW_RENAMES = True
+OPENID_SREG_REQUIRED_FIELDS = ['email']
 OPENID_CREATE_USERS = True
-
-# Can we reuse existing users?
 OPENID_REUSE_USERS = True
-
-# When logging in again, should we overwrite user details based on
-# data received via Simple Registration?
 OPENID_UPDATE_DETAILS_FROM_SREG = True
-
-# If set, always use this as the identity URL rather than asking the
-# user.  This only makes sense if it is a server URL.
 OPENID_SSO_SERVER_URL = 'https://login.ubuntu.com/'
 
 # Tell django.contrib.auth to use the OpenID signin URLs.