Merge lp:~daker/loco-team-portal/fix.876659 into lp:loco-team-portal

[Adnane Belmadiaf]

* More SEO friendly urls
* Fixed the tests
* Moved the manages to a sperate file

=== modified file 'loco_directory/common/utils.py'
--- loco_directory/common/utils.py	2012-11-09 23:35:39 +0000
+++ loco_directory/common/utils.py	2012-11-28 00:51:20 +0000
@@ -49,18 +49,6 @@
     return reduce(lambda a, b: a.extend(b) or a, some_list)
 
 
-# pylint: disable-msg=C0103
-def redirect(to, *args, **kwargs):
-    from distutils.version import LooseVersion as V
-    import django
-    if V(django.get_version()) > V('1.1'):
-        from django.shortcuts import redirect as red
-    else:
-        from shortcuts import redirect as red
-
-    return red(to, *args, **kwargs)
-
-
 def get_locodirectory_version(version_file, debug):
     """
     return the bzr revision number and version of the LoCo Team Portal

=== added file 'loco_directory/events/managers.py'
--- loco_directory/events/managers.py	1970-01-01 00:00:00 +0000
+++ loco_directory/events/managers.py	2012-11-28 00:51:20 +0000
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+from django.db import models
+import datetime
+
+
+class GlobalEventManager(models.Manager):
+    """ manager for a global event """
+    def next_events(self):
+        """ a list with all upcoming global events """
+        return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')
+
+    def history_events(self):
+        """ all global events in history """
+        return self.filter(date_end__lt=datetime.datetime.now()).order_by('date_end')
+
+
+class TeamEventManager(models.Manager):
+    """ manager for a team event """
+    def next_3_events(self):
+        """ a list with the next 3 events """
+        return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')[:3]
+
+    def next_5_events(self):
+        """ a list with the next 5 events """
+        return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')[:5]
+
+    def next_events(self):
+        """ a list with all upcoming team events """
+        return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')
+
+    def history_events(self):
+        """ all team events in history """
+        return self.filter(date_end__lt=datetime.datetime.now()).order_by('-date_end')
+
+    def has_location(self):
+        return self.filter(venue__longitude__isnull=False, venue__latitude__isnull=False)

=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2012-06-30 23:44:14 +0000
+++ loco_directory/events/models.py	2012-11-28 00:51:20 +0000
@@ -1,11 +1,16 @@
+# -*- coding: utf-8 -*-
 from django.db import models
+from django.template.defaultfilters import slugify
+from django.utils.translation import ugettext_lazy as _
+
 from userprofiles.models import UserProfile
 from teams.models import *
 from venues.models import Venue
-from django.utils.translation import ugettext_lazy as _
 from common.shortcuts import queryset_sum, queryset_count
 from common.mixins import LocalTimeMixin
 
+from managers import GlobalEventManager, TeamEventManager
+
 ATTENDEE_PROMISE_CHOICES = (
     ('sure', _('attending')),
     ('maybe', _('might be attending')),
@@ -46,25 +51,6 @@
         return self.date_end > datetime.datetime.today()
 
 
-class GlobalEventManager(models.Manager):
-    """ manager for a global event """
-    def next_events(self):
-        """ a list with all upcoming global events """
-        return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')
-
-    def history_events(self):
-        """ all  global events in history """
-        return self.filter(date_end__lt=datetime.datetime.now()).order_by('date_end')
-
-    def random_5(self):
-        """ return 5 random Team Events for this global event """
-        return TeamEvent.objects.filter(global_event__id__exact=self.id).order_by('?')[:5]
-
-    def last_5(self):
-        """ return the last 5 active Team events for this global event"""
-        return TeamEvent.objects.filter(global_event__id__exact=self.id).order_by('?')[5:]
-
-
 class GlobalEvent(BaseEvent):
     """
     a global event. other events can attend to a global event
@@ -94,34 +80,6 @@
                                                                                                                              'countries': countries})
 
 
-class TeamEventManager(models.Manager):
-    """ manager for a team event """
-    def next_3_events(self):
-        """ a list with the next 3 events """
-        return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')[:3]
-
-    def next_5_events(self):
-        """ a list with the next 5 events """
-        return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')[:5]
-
-    def next_events(self):
-        """ a list with all upcoming team events """
-        return self.filter(date_end__gt=datetime.datetime.now()).order_by('date_end')
-
-    def history_events(self):
-        """ all team events in history """
-        return self.filter(date_end__lt=datetime.datetime.now()).order_by('-date_end')
-
-    def attending(self):
-        return Attendee.objects.filter(event__id__exact=self.id)
-
-    def random_5_attendees(self):
-        return Attendee.objects.filter(event__id__exact=self.id).order_by('?')[5:]
-
-    def has_location(self):
-        return self.filter(venue__longitude__isnull=False, venue__latitude__isnull=False)
-
-
 class TeamEvent(BaseEvent, LocalTimeMixin):
     """
     a event of one or more teams
@@ -141,7 +99,7 @@
 
     @models.permalink
     def get_absolute_url(self):
-        return ('team-event-detail', [getattr(self.first_team(), 'lp_name', 'no-team'), str(self.id)])
+        return ('team-event-detail', [getattr(self.first_team(), 'lp_name', 'no-team'), str(self.id), slugify(self.name)])
 
     def get_tz(self):
         timezone = 'UTC'
@@ -183,7 +141,7 @@
         try:
             return self.teams.all()[0]
         except:
-            print 'Event %s has no team' % self.id
+            #print 'Event %s has no team' % self.id
             return {'lp_name': 'no-team'}
 
     def is_attending(self, user):
@@ -195,13 +153,13 @@
     def total_attending(self):
         total_attending_guests = queryset_sum('guests', Attendee.objects.filter(team_event__id__exact=self.id).filter(promise="sure"))
         total_attending_registered = queryset_count('attendee_profile', Attendee.objects.filter(team_event__id__exact=self.id).filter(promise="sure"))
-        return  total_attending_guests + total_attending_registered
+        return total_attending_guests + total_attending_registered
 
     def total_maybe_attending(self):
 
         total_maybe_attending_guests = queryset_sum('guests', Attendee.objects.filter(team_event__id__exact=self.id).filter(promise="maybe"))
         total_maybe_attending_registered = queryset_count('attendee_profile', Attendee.objects.filter(team_event__id__exact=self.id).filter(promise="maybe"))
-        return  total_maybe_attending_guests + total_maybe_attending_registered
+        return total_maybe_attending_guests + total_maybe_attending_registered
 
 
 class TeamEventComment(models.Model):

=== modified file 'loco_directory/events/urls.py'
--- loco_directory/events/urls.py	2012-09-08 21:45:10 +0000
+++ loco_directory/events/urls.py	2012-11-28 00:51:20 +0000
@@ -20,19 +20,20 @@
     #team events
     url(r'^locations/$', 'events.views.team_event_locations', name='team-event-locations'),
     url(r'^ical/$', 'events.views.teams_event_list_ical', name='teams-event-list-ical'),
+    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)-(?P<event_slug>[a-zA-Z0-9\-\.\+?]+)/$', 'events.views.team_event_detail', name='team-event-detail'),
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/detail/ical/$', 'events.views.event_ical', name='event-ical'),
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/register/$', 'events.views.team_event_register', name='team-event-register'),
-    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/detail/$', 'events.views.team_event_detail', name='team-event-detail'),
+    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/detail/$', 'events.views.team_event_detail', name='team-event-detail-old'),
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/delete/$', 'events.views.team_event_delete', name='team-event-delete'),
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/update/$', 'events.views.team_event_update', name='team-event-update'),
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_event_id>\d+)/copy/$', 'events.views.team_event_copy', name='team-event-copy'),
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/add/$', 'events.views.team_event_new', name='team-event-new'),
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/rss/$', 'events.views.team_events_rss', name='team-events-rss'),
     url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/ical/$', 'events.views.team_event_list_ical', name='team-event-list-ical'),
-    url(r'^add/$', 'events.views.team_event_select', name='team-event-select'),    
+    url(r'^add/$', 'events.views.team_event_select', name='team-event-select'),
     url(r'^comment-update/$', 'events.views.team_event_comment_edit', name='team-event-comment-edit'),
     url(r'^comment-delete/(?P<pk>\d+)/$', 'events.views.team_event_comment_delete', name='team-event-comment-delete'),
-    
+
     # Old url notations
     url(r'^team/locations/$', 'events.views.team_event_locations'),
     url(r'^team/ical/$', 'events.views.teams_event_list_ical'),

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2012-11-26 23:07:59 +0000
+++ loco_directory/events/views.py	2012-11-28 00:51:20 +0000
@@ -16,7 +16,7 @@
 from forms import GlobalEventForm
 from forms import AttendeeRegistrationForm
 
-from common.utils import redirect, simple_iterator
+from common.utils import simple_iterator
 from common.forms import FilterHistoryList
 from common import launchpad
 
@@ -133,7 +133,7 @@
 #################################################################
 # Team Events
 #################################################################
-def team_event_detail(request, team_slug, team_event_id):
+def team_event_detail(request, team_slug, team_event_id, event_slug=None):
     """
     detailed view for a team event
     """
@@ -148,9 +148,7 @@
             if form.is_valid():
                 team_event_comment = form.save(commit=False)
                 team_event_comment.team_event = team_event_object
-                from userprofiles.models import create_profile
-                profile = create_profile(request.user.username)
-                team_event_comment.commenter_profile = profile
+                team_event_comment.commenter_profile = request.user.get_profile()
                 team_event_comment.save()
                 request.user.message_set.create(message=_('Your comment has been saved.'))
                 return redirect(team_event_object)
@@ -192,7 +190,6 @@
         else:
             context = {'team_event_object': team_event_object}
             return render_to_response('events/team_event_delete_confirm.html', context, RequestContext(request))
-
     else:
         request.user.message_set.create(message='%s %s' % (_('You can not remove this team event.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.')))
         return redirect(team_event_object)
@@ -207,7 +204,7 @@
     elif len(teams) == 1:
         from django.core import urlresolvers
         url = urlresolvers.reverse('team-event-new', args=[teams[0].lp_name])
-        if request.GET.has_key('global_event_id'):
+        if 'global_event_id' in request.GET:
             return HttpResponseRedirect('%s?global_event_id=%s' % (url, request.GET.get('global_event_id', None)))
         else:
             return HttpResponseRedirect(url)
@@ -240,7 +237,7 @@
                 return HttpResponseRedirect(team_event.get_absolute_url())
         else:
             form = TeamEventForm(initial={'global_event': request.GET.get('global_event_id', None)}, teams=[team_object])
-            if request.GET.has_key('global_event_id'):
+            if 'global_event_id' in request.GET:
                 global_event = get_object_or_404(GlobalEvent, pk=request.GET.get('global_event_id'))
         context = {
             'team_object': team_object,
@@ -331,11 +328,9 @@
     """
     team_event_object = get_object_or_404(TeamEvent, pk=team_event_id)
     if team_event_object.is_attending(request.user):
-        attendee_object = team_event_object.attendee_set.get(attendee_profile__user=request.user)
+        attendee_object = team_event_object.attendee_set.get(attendee_profile=request.user.get_profile())
     else:
-        from userprofiles.models import create_profile
-        profile = create_profile(request.user.username)
-        attendee_object = Attendee(team_event=team_event_object, attendee_profile=profile)
+        attendee_object = Attendee(team_event=team_event_object, attendee_profile=request.user.get_profile())
 
     if request.method == 'POST':
         form = AttendeeRegistrationForm(instance=attendee_object, data=request.POST)
@@ -358,6 +353,7 @@
     return render_to_response('events/team_event_register.html',
                                      context, RequestContext(request))
 
+
 @login_required
 def team_event_comment_new(request, team_slug, team_event_id):
     """
@@ -370,12 +366,10 @@
         if form.is_valid():
             team_event_comment = form.save(commit=False)
             team_event_comment.team_event = team_event_object
-            from userprofiles.models import create_profile
-            profile = create_profile(request.user.username)
-            team_event_comment.commenter_profile = profile
+            team_event_comment.commenter_profile = request.user.get_profile()
             team_event_comment.save()
             request.user.message_set.create(message=_('Comment saved.'))
-            return redirect( team_event_object )
+            return redirect(team_event_object)
     else:
         form = TeamEventCommentForm()
 

=== modified file 'loco_directory/meetings/views.py'
--- loco_directory/meetings/views.py	2012-11-26 23:07:59 +0000
+++ loco_directory/meetings/views.py	2012-11-28 00:51:20 +0000
@@ -1,7 +1,6 @@
 from django.template import RequestContext
 from django.http import HttpResponse, HttpResponseRedirect
-from django.shortcuts import render_to_response
-from django.shortcuts import get_object_or_404
+from django.shortcuts import render_to_response, redirect, get_object_or_404
 from django.contrib.auth.decorators import login_required
 from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
@@ -11,9 +10,6 @@
 
 from forms import TeamMeetingForm, AgendaItemForm
 
-from django.db.models import Q
-
-from common.utils import redirect, simple_iterator
 from common import launchpad
 from common.forms import FilterHistoryList
 
@@ -164,8 +160,7 @@
         request.user.message_set.create(message='%s %s' % (_('You can not remove this team meeting.'), _('You are not a member of any LoCo Teams.')))
         return redirect( 'meeting-list' )
     elif len(teams) == 1:
-        from django.core import urlresolvers
-        url = urlresolvers.reverse('team-meeting-new', args=[teams[0].lp_name])
+        url = reverse('team-meeting-new', args=[teams[0].lp_name])
         return HttpResponseRedirect(url)
     else:
         context = {'teams': teams}

=== modified file 'loco_directory/teams/tests.py'
--- loco_directory/teams/tests.py	2012-11-23 21:40:17 +0000
+++ loco_directory/teams/tests.py	2012-11-28 00:51:20 +0000
@@ -26,7 +26,7 @@
             claimed_id='http://example.com/identity_foo',
             display_id='http://example.com/identity_foo')
         self.useropenid_foo.save()
-        self.userprofile_foo = UserProfile.objects.create(user=self.user_foo)
+        self.userprofile_foo = self.user_foo.get_profile()
 
         # user bar
         self.user_bar = User.objects.create(
@@ -38,7 +38,7 @@
             claimed_id='http://example.com/identity_bar',
             display_id='http://example.com/identity_bar')
         self.useropenid_bar.save()
-        self.userprofile_bar = UserProfile.objects.create(user=self.user_bar)
+        self.userprofile_bar = self.user_bar.get_profile()
 
         # setup test country
         self.country = Country.objects.create(name='Test Country')

=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py	2012-11-26 23:07:59 +0000
+++ loco_directory/teams/views.py	2012-11-28 00:51:20 +0000
@@ -1,18 +1,14 @@
 # -*- coding: utf-8 -*-
-
 from django.template import RequestContext
 from django.utils.translation import ugettext
 from django.core import serializers
 
+from django.shortcuts import render_to_response, redirect, get_object_or_404
 from django.contrib.auth.decorators import login_required
-from django.db.models import Q
-
-from django.shortcuts import get_object_or_404
-from django.shortcuts import render_to_response
 
 from django import http
 
-from common.utils import redirect, simple_iterator
+from common.utils import simple_iterator
 from common import launchpad
 
 from teams.models import Continent, Team, countries_without_continent, countries_without_continent_have_teams, teams_without_country

=== modified file 'loco_directory/templates/events/team_event_detail.html'
--- loco_directory/templates/events/team_event_detail.html	2012-09-08 21:45:10 +0000
+++ loco_directory/templates/events/team_event_detail.html	2012-11-28 00:51:20 +0000
@@ -9,7 +9,7 @@
 {% if team_event_object.description %}
 <meta property="og:description" content="{{ team_event_object.description|linebreaks|striptags }}" />
 {% endif %}
-<meta property="og:url" content="http://loco.ubuntu.com{% url team-event-detail team_event_object.first_team.lp_name team_event_object.id %}"/>
+<meta property="og:url" content="http://loco.ubuntu.com{{ team_event_object.get_absolute_url }}"/>
 <meta property="og:image" content="http://loco.ubuntu.com/media/images/cof_orange_hex1.png"/>
 <meta property="og:site_name" content="Loco Team Portal"/>
 <meta property="og:type" content="loco-team-portal:event"/>

=== modified file 'loco_directory/templates/events/team_event_detail.inc.html'
--- loco_directory/templates/events/team_event_detail.inc.html	2012-09-08 21:45:10 +0000
+++ loco_directory/templates/events/team_event_detail.inc.html	2012-11-28 00:51:20 +0000
@@ -6,7 +6,7 @@
                 <h3>{{ team_event_object.name }}</h3>
                 {% if team_event_object.global_event %}
                     <div class="event-partofglobal-event">
-                        {% trans "This event is part of" %} 
+                        {% trans "This event is part of" %}
                         <a href="{{ team_event_object.global_event.get_absolute_url }}">{{team_event_object.global_event.name }}</a>
                     </div>
                 {% endif %}
@@ -23,7 +23,7 @@
                     <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
                     <g:plusone size="medium"></g:plusone>
                     <a href="http://twitter.com/share" class="twitter-share-button" data-lang="en">Tweet</a>
-                    <div class="fb-like" data-href="http://loco.ubuntu.com{% url team-event-detail team_event_object.first_team.lp_name team_event_object.id %}" data-send="false" data-layout="button_count" data-width="40" data-show-faces="false" data-font="arial"></div>
+                    <div class="fb-like" data-href="http://loco.ubuntu.com{{ team_event_object.get_absolute_url }}" data-send="false" data-layout="button_count" data-width="40" data-show-faces="false" data-font="arial"></div>
                 </div>
 
                 {% if team_event_object.global_event %}
@@ -50,7 +50,7 @@
                     </div>
                 {% endif %}
             </div>
-            
+
             <div class="map">
                 <img class="map_img" src="http://maps.googleapis.com/maps/api/staticmap?center=Brooklyn+Bridge,New+York,NY&zoom=13&size=640x100&scale=1&maptype=roadmap&markers=color:orange%7Clabel:S%7C40.702147,-74.015794&sensor=false">
             </div>
@@ -67,7 +67,7 @@
                 </div>
 
                 <div class="event-venue-adress">
-                    {% if team_event_object.venue.address %}{{ team_event_object.venue.address }}{% endif %}{% if team_event_object.venue.spr %}, {{ team_event_object.venue.spr }}{% endif %} 
+                    {% if team_event_object.venue.address %}{{ team_event_object.venue.address }}{% endif %}{% if team_event_object.venue.spr %}, {{ team_event_object.venue.spr }}{% endif %}
                 </div>
             </div>
             {% endif %}
@@ -104,7 +104,7 @@
                             {% for team in team_event_object.teams.all %}<a  class="pictogram-l" title="{% trans "Get more information about this team" %}" href="{{ team.get_absolute_url }}">{{ team.name }}</a>{% if not forloop.last %},{% endif %}{% endfor %}
                         </div>
                     {% endif %}
-                {% endif %}                     
+                {% endif %}
             </div>
 
             {% if team_event_object.registration %}

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2012-11-26 23:07:59 +0000
+++ loco_directory/templates/teams/team_detail.html	2012-11-28 00:51:20 +0000
@@ -185,7 +185,7 @@
                 </div>
                 {% if team.next_5_events_and_meetings %}
                     {% for team_event in team.next_5_events_and_meetings %}
-                    <a href="{% url team-event-detail team_event.first_team.lp_name team_event.id %}" title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" class="event-meetings">
+                    <a href="{{ team_event.get_absolute_url }}" title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" class="event-meetings">
                         <span class="title">{{ team_event.name }}</span>
                         <small>{{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}</small>
                         <p>{{ team_event.description }}</p>

=== modified file 'loco_directory/userprofiles/models.py'
--- loco_directory/userprofiles/models.py	2012-11-18 22:02:56 +0000
+++ loco_directory/userprofiles/models.py	2012-11-28 00:51:20 +0000
@@ -102,9 +102,8 @@
 
 post_save.connect(create_userprofile, sender=auth_models.User, dispatch_uid=__name__)
 
+
 def create_profile(username):
     user, created = auth_models.User.objects.get_or_create(username=username)
-    if created:
-        user.save()
     set_user_openid(user, force=True)
     return user.get_profile()