Merge lp:~ronnie.vd.c/loco-team-portal/736208-url-name into lp:loco-team-portal

[Ronnie]

[Chris Johnston (cjohnston)]

When adding a team event, click submit and I get:

Exception Type: NoReverseMatch at /events/ubuntu-us-florida/add/
Exception Value: Reverse for 'team-event-detail' with arguments '()' and keyword arguments '{'team_event_id': 818}' not found.

Unable to click on links that are to global events.

review: Needs Fixing

[Chris Johnston (cjohnston)]

For adding a meeting I get:

Exception Type: NoReverseMatch at /meetings/ubuntu-us-florida/add/
Exception Value: Reverse for 'team-meeting-detail' with arguments '()' and keyword arguments '{'team_meeting_id': 53}' not found.

[lp:~ronnie.vd.c/loco-team-portal/736208-url-name]

424. By Ronnie on 2011-03-18

Changed redirect urls

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'loco_directory/events/models.py'
--- loco_directory/events/models.py	2011-03-02 23:05:59 +0000
+++ loco_directory/events/models.py	2011-03-18 13:41:34 +0000
@@ -148,9 +148,16 @@
             self.date_end = local_end
     local_date_end = property(get_local_end, set_local_end)
     
+    def first_team(self):
+        try:
+            return self.teams.all()[0]
+        except:
+            print 'Event %s has no team' % self.id
+            return {'lp_name':'no-team'}
+    
     @models.permalink
     def get_absolute_url(self):
-        return ('team-event-detail', [str(self.id)])
+        return ('team-event-detail', [getattr(self.first_team(), 'lp_name', 'no-team'), str(self.id)])
 
     def is_attending(self, user):
         if user.is_authenticated():

=== modified file 'loco_directory/events/urls.py'
--- loco_directory/events/urls.py	2011-02-17 20:05:03 +0000
+++ loco_directory/events/urls.py	2011-03-18 13:41:34 +0000
@@ -4,20 +4,7 @@
     #all events                   
     url(r'^$', 'events.views.event_list', name='event-list'),
     url(r'^history/$', 'events.views.event_history_list', name='event-history-list'),
-    #team events
-    url(r'^team/locations/$', 'events.views.team_event_locations', name='team-event-locations'),
-    url(r'^team/ical/$', 'events.views.teams_event_list_ical', name='teams-event-list-ical'),
-    url(r'^team/(?P<team_event_id>\d+)/detail/ical/$', 'events.views.event_ical', name='event-ical'),
-    url(r'^team/(?P<team_event_id>\d+)/register/$', 'events.views.team_event_register', name='team-event-register'),
-    url(r'^team/(?P<team_event_id>\d+)/detail/$', 'events.views.team_event_detail', name='team-event-detail'),
-    url(r'^team/(?P<team_event_id>\d+)/delete/$', 'events.views.team_event_delete', name='team-event-delete'),
-    url(r'^team/(?P<team_event_id>\d+)/update/$', 'events.views.team_event_update', name='team-event-update'),
-    url(r'^team/(?P<team_event_id>\d+)/comment/$', 'events.views.team_event_comment_new', name='team-event-comment-new'),
-    url(r'^team/(?P<team_event_id>\d+)/copy/$', 'events.views.team_event_copy', name='team-event-copy'),
-    url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/add/$', 'events.views.team_event_new', name='team-event-new'),
-    url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/rss/$', 'events.views.team_events_rss', name='team-events-rss'),
-    url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/ical/$', 'events.views.team_event_list_ical', name='team-event-list-ical'),
-    url(r'^team/add/$', 'events.views.team_event_select', name='team-event-select'),
+    
     #global events
     url(r'^global/ical/$', 'events.views.global_event_list_ical', name='global-event-list-ical'),
     url(r'^global/(?P<global_event_id>\d+)/detail/$', 'events.views.global_event_detail', name='global-event-detail'),
@@ -25,5 +12,24 @@
     url(r'^global/(?P<global_event_id>\d+)/update/$', 'events.views.global_event_update', name='global-event-update'),
     url(r'^global/(?P<global_event_id>\d+)/locations/$', 'events.views.global_event_locations', name='global-event-locations'),
     url(r'^global/add/$', 'events.views.global_event_new', name='global-event-new'),
-
+    
+    #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+)/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+)/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+)/comment/$', 'events.views.team_event_comment_new', name='team-event-comment-new'),
+    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'),
+    
+    # Old url notations
+    url(r'^team/locations/$', 'events.views.team_event_locations'),
+    url(r'^team/ical/$', 'events.views.teams_event_list_ical'),
+    url(r'^team/add/$', 'events.views.team_event_select'),
 )

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2011-03-06 22:13:43 +0000
+++ loco_directory/events/views.py	2011-03-18 13:41:34 +0000
@@ -57,7 +57,7 @@
     
     return response
 
-def event_ical(request, team_event_id):
+def event_ical(request, team_slug, team_event_id):
     """
     Return a ical list with a single events in ical format.
     """
@@ -102,7 +102,7 @@
 # Team Events
 #################################################################
 
-def team_event_detail(request, team_event_id):
+def team_event_detail(request, team_slug, team_event_id):
     """
     detailed view for a team event
     """
@@ -120,7 +120,7 @@
                                          context, RequestContext(request))
 
 @login_required
-def team_event_delete(request, team_event_id):
+def team_event_delete(request, team_slug, team_event_id):
     """
     delete a event
     """
@@ -204,7 +204,7 @@
                 team_event = form.save()
                 team_event.teams.add(team_object)
                 team_event_id = team_event.id 
-                return HttpResponseRedirect(reverse('team-event-detail', kwargs={'team_event_id': team_event_id}))
+                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'):
@@ -223,7 +223,7 @@
         return redirect( team_object )
 
 @login_required
-def team_event_copy(request, team_event_id):
+def team_event_copy(request, team_slug, team_event_id):
     """
     new team event
     """
@@ -242,7 +242,7 @@
                 team_event = form.save()
                 team_event.teams.add(team_object)
                 team_event_id = team_event.id 
-                return HttpResponseRedirect(reverse('team-event-detail', kwargs={'team_event_id': team_event_id}))
+                return HttpResponseRedirect(team_event.get_absolute_url())
         else:
             form = TeamEventForm(instance=team_event, teams=team_event.teams.all())
         
@@ -258,7 +258,7 @@
         return redirect( team_object )
 
 @login_required
-def team_event_update(request, team_event_id):
+def team_event_update(request, team_slug, team_event_id):
     """
     update team event
     """
@@ -292,7 +292,7 @@
         return redirect( team_event_object )
 
 @login_required
-def team_event_register(request, team_event_id):
+def team_event_register(request, team_slug, team_event_id):
     """
     register as attendee for a team event
     """
@@ -326,7 +326,7 @@
                                      context, RequestContext(request))
 
 @login_required
-def team_event_comment_new(request, team_event_id):
+def team_event_comment_new(request, team_slug, team_event_id):
     """
     create a comment for a team event
     """

=== modified file 'loco_directory/meetings/models.py'
--- loco_directory/meetings/models.py	2011-03-02 23:05:59 +0000
+++ loco_directory/meetings/models.py	2011-03-18 13:41:34 +0000
@@ -56,10 +56,17 @@
         
     def __unicode__(self):
         return "%s %s" % (self.name, self.date_begin or "")
+        
+    def first_team(self):
+        try:
+            return self.teams.all()[0]
+        except:
+            print 'Meeting %s has no team' % self.id
+            return {'lp_name':'no-team'}
 
     @models.permalink
     def get_absolute_url(self):
-        return ('team-meeting-detail', [str(self.id)])
+        return ('team-meeting-detail', [getattr(self.first_team(), 'lp_name', 'no-team'), str(self.id)])
         
     #add manager
     objects = TeamMeetingManager()

=== modified file 'loco_directory/meetings/urls.py'
--- loco_directory/meetings/urls.py	2011-01-23 02:17:54 +0000
+++ loco_directory/meetings/urls.py	2011-03-18 13:41:34 +0000
@@ -5,18 +5,22 @@
     url(r'^$', 'meetings.views.meeting_list', name='meeting-list'),
     url(r'^history/$', 'meetings.views.meeting_history_list', name='meeting-history-list'),
     #team meetings
-    url(r'^team/ical/$', 'meetings.views.teams_meeting_list_ical', name='teams-meeting-list-ical'),
-    url(r'^team/(?P<team_meeting_id>\d+)/detail/ical/$', 'meetings.views.meeting_ical', name='meeting-ical'),
-    url(r'^team/(?P<team_meeting_id>\d+)/detail/$', 'meetings.views.team_meeting_detail', name='team-meeting-detail'),
-    url(r'^team/(?P<team_meeting_id>\d+)/delete/$', 'meetings.views.team_meeting_delete', name='team-meeting-delete'),
-    url(r'^team/(?P<team_meeting_id>\d+)/update/$', 'meetings.views.team_meeting_update', name='team-meeting-update'),
-    url(r'^team/(?P<team_meeting_id>\d+)/copy/$', 'meetings.views.team_meeting_copy', name='team-meeting-copy'),
-    url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/add/$', 'meetings.views.team_meeting_new', name='team-meeting-new'),
-    url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/rss/$', 'meetings.views.team_meetings_rss', name='team-meetings-rss'),
-    url(r'^team/(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/ical/$', 'meetings.views.team_meeting_list_ical', name='team-meeting-list-ical'),
-    url(r'^team/add/$', 'meetings.views.team_meeting_select', name='team-meeting-select'),
+    url(r'^ical/$', 'meetings.views.teams_meeting_list_ical', name='teams-meeting-list-ical'),
+    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_meeting_id>\d+)/detail/ical/$', 'meetings.views.meeting_ical', name='meeting-ical'),
+    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_meeting_id>\d+)/detail/$', 'meetings.views.team_meeting_detail', name='team-meeting-detail'),
+    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_meeting_id>\d+)/delete/$', 'meetings.views.team_meeting_delete', name='team-meeting-delete'),
+    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_meeting_id>\d+)/update/$', 'meetings.views.team_meeting_update', name='team-meeting-update'),
+    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/(?P<team_meeting_id>\d+)/copy/$', 'meetings.views.team_meeting_copy', name='team-meeting-copy'),
+    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/add/$', 'meetings.views.team_meeting_new', name='team-meeting-new'),
+    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/rss/$', 'meetings.views.team_meetings_rss', name='team-meetings-rss'),
+    url(r'^(?P<team_slug>[a-zA-Z0-9\-\.\+?]+)/ical/$', 'meetings.views.team_meeting_list_ical', name='team-meeting-list-ical'),
+    url(r'^add/$', 'meetings.views.team_meeting_select', name='team-meeting-select'),
 
     url(r'^team/(?P<team_meeting_id>\d+)/agenda/(?P<agenda_item_id>\d+)/delete/$', 'meetings.views.agenda_item_delete', name='agenda-item-delete'),
     url(r'^team/(?P<team_meeting_id>\d+)/agenda/(?P<agenda_item_id>\d+)/update/$', 'meetings.views.agenda_item_update', name='agenda-item-update'),
     url(r'^team/(?P<team_meeting_id>\d+)/agenda/add/$', 'meetings.views.agenda_item_new', name='agenda-item-new'),
+    
+    #Old url notations
+    url(r'^team/ical/$', 'meetings.views.teams_meeting_list_ical'),
+    url(r'^team/add/$', 'meetings.views.team_meeting_select'),
 )

=== modified file 'loco_directory/meetings/views.py'
--- loco_directory/meetings/views.py	2011-02-23 01:05:59 +0000
+++ loco_directory/meetings/views.py	2011-03-18 13:41:34 +0000
@@ -52,7 +52,7 @@
     return response
     
 
-def meeting_ical(request, team_meeting_id):
+def meeting_ical(request, team_slug, team_meeting_id):
     """
     Return a ical list with a single meetings in ical format.
     """
@@ -89,7 +89,7 @@
 # Team Meetings
 #################################################################
 
-def team_meeting_detail(request, team_meeting_id):
+def team_meeting_detail(request, team_slug, team_meeting_id):
     team_meeting_object = get_object_or_404(TeamMeeting, pk=team_meeting_id)
     is_member = False
     for team_object in team_meeting_object.teams.all():
@@ -103,7 +103,7 @@
                                          context, RequestContext(request))
 
 @login_required
-def team_meeting_delete(request, team_meeting_id):
+def team_meeting_delete(request, team_slug, team_meeting_id):
     """
     delete a meeting
     """
@@ -185,7 +185,7 @@
                 team_meeting = form.save()
                 team_meeting.teams.add(team_object)
                 team_meeting_id = team_meeting.id 
-                return HttpResponseRedirect(reverse('team-meeting-detail', kwargs={'team_meeting_id': team_meeting_id}))
+                return HttpResponseRedirect(team_meeting_object.get_absolute_url())
         else:
             form = TeamMeetingForm(teams=[team_object], instance=team_meeting_object)
                 
@@ -201,7 +201,7 @@
         return redirect( team_object )
 
 @login_required
-def team_meeting_copy(request, team_meeting_id):
+def team_meeting_copy(request, team_slug, team_meeting_id):
     """
     copy team meeting
     """
@@ -220,7 +220,7 @@
                 team_meeting = form.save()
                 team_meeting.teams.add(team_object)
                 team_meeting_id = team_meeting.id 
-                return HttpResponseRedirect(reverse('team-meeting-detail', kwargs={'team_meeting_id': team_meeting_id}))
+                return HttpResponseRedirect(team_meeting.get_absolute_url())
         else:
             form = TeamMeetingForm(instance=team_meeting, teams=team_meeting.teams.all())
         
@@ -236,7 +236,7 @@
         return redirect( team_object )
 
 @login_required
-def team_meeting_update(request, team_meeting_id):
+def team_meeting_update(request, team_slug, team_meeting_id):
     """
     update team meeting
     """

=== modified file 'loco_directory/templates/events/team_event_detail.html'
--- loco_directory/templates/events/team_event_detail.html	2010-11-20 17:25:50 +0000
+++ loco_directory/templates/events/team_event_detail.html	2011-03-18 13:41:34 +0000
@@ -5,15 +5,15 @@
 
 {% block sub_nav_links %}
 <a class="sub-nav-item" href="{% url event-list %}">{% trans "Back to Events List" %}</a>
-<a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.id %}#comment">{% trans "Add Comment" %}</a>
+<a class="sub-nav-item" href="{% url team-event-comment-new team_event_object.first_team.lp_name team_event_object.id %}#comment">{% trans "Add Comment" %}</a>
 {% if user.is_authenticated %}
   {% if user_is_team_member %}
-    <a class="sub-nav-item" href="{% url team-event-update team_event_object.id %}">{% trans "Edit Details" %}</a>
-    <a class="sub-nav-item" href="{% url team-event-delete team_event_object.id %}">{% trans "Delete Event" %}</a>
-    <a class="sub-nav-item" href="{% url team-event-copy team_event_object.id %}">{% trans "Copy Event" %}</a>
+    <a class="sub-nav-item" href="{% url team-event-update team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Edit Details" %}</a>
+    <a class="sub-nav-item" href="{% url team-event-delete team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Delete Event" %}</a>
+    <a class="sub-nav-item" href="{% url team-event-copy team_event_object.first_team.lp_name team_event_object.id %}">{% trans "Copy Event" %}</a>
   {% endif %}
 {% endif %}
-<a class="sub-nav-item" href="{% url event-ical team_event_object.id %}">{% trans "iCal Feed" %}</a>
+<a class="sub-nav-item" href="{% url event-ical team_event_object.first_team.lp_name team_event_object.id %}">{% trans "iCal Feed" %}</a>
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/templates/events/team_event_detail_attendees.inc.html'
--- loco_directory/templates/events/team_event_detail_attendees.inc.html	2011-01-02 18:45:45 +0000
+++ loco_directory/templates/events/team_event_detail_attendees.inc.html	2011-03-18 13:41:34 +0000
@@ -5,12 +5,12 @@
         <td colspan="2">
             {% if user.is_authenticated %}
                 {% if user_is_attending %}
-                    <a href="{% url team-event-register team_event_object.id %}">{% trans 'Change your Registration Status' %}</a>
+                    <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Change your Registration Status' %}</a>
                 {% else %}
-                    <a href="{% url team-event-register team_event_object.id %}">{% trans 'Register for this Event' %}</a>
+                    <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register for this Event' %}</a>
                 {% endif %}
             {% else %}
-                <a href="{% url team-event-register team_event_object.id %}">{% trans 'Register for this Event' %}</a>
+                <a href="{% url team-event-register team_event_object.first_team.lp_name team_event_object.id %}">{% trans 'Register for this Event' %}</a>
             {% endif %}
         </td>
     </tr>    

=== modified file 'loco_directory/templates/events/team_event_detail_comments.inc.html'
--- loco_directory/templates/events/team_event_detail_comments.inc.html	2010-11-19 13:17:17 +0000
+++ loco_directory/templates/events/team_event_detail_comments.inc.html	2011-03-18 13:41:34 +0000
@@ -3,7 +3,7 @@
 <table id="team-event-comments">
     <tr>
         <td colspan="2" class="form-item-value">
-            <a href="{% url team-event-comment-new team_event_object.id %}#comment">{% trans "Add Comment" %}</a>
+            <a href="{% url team-event-comment-new team_event_object.first_team.lp_name team_event_object.id %}#comment">{% trans "Add Comment" %}</a>
         </td>
     </tr>
 {% regroup team_event_object.teameventcomment_set.all by local_date_created|date:"D d M Y" as comment_list %}

=== modified file 'loco_directory/templates/events/team_event_li.inc.html'
--- loco_directory/templates/events/team_event_li.inc.html	2011-01-20 14:36:48 +0000
+++ loco_directory/templates/events/team_event_li.inc.html	2011-03-18 13:41:34 +0000
@@ -1,5 +1,5 @@
     {% load i18n %}
     {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
     <li>
-        <a title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}
+        <a title="{% if team_event.venue %}{% else %}{{team_event.date_begin|date:"M d"}}{% endif %}" href="{% url team-event-detail team_event.first_team.lp_name team_event.id %}">{{ team_event.name }}</a> {% trans "on" %} {{ team_event.local_date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.local_date_begin|date:"H:i T" }}
     </li> 

=== modified file 'loco_directory/templates/events/team_events_rss.xml'
--- loco_directory/templates/events/team_events_rss.xml	2010-08-17 08:48:39 +0000
+++ loco_directory/templates/events/team_events_rss.xml	2011-03-18 13:41:34 +0000
@@ -8,7 +8,7 @@
 		{% for e in events %}
 		<item>
 			<title> {{ e.name }}</title>
-			<link>{{base}}{% url team-event-detail e.id %}</link>
+			<link>{{base}}{% url team-event-detail e.first_team.lp_name e.id %}</link>
 			<description>{% trans "When:" %} {% spaceless %}
 			{% ifequal e.date_begin|date e.date_end|date %}
 				{{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"H:i O" }}
@@ -17,7 +17,7 @@
 			{% endifequal %}
 			{% endspaceless %}{% if e.venue.name %} | {% trans "Where:" %} {{ e.venue.name }}{% endif %}
 			{% if e.description %} | {% trans "Description:" %} {{ e.description }}{% endif %}</description>
-			<guid>{{base}}{% url team-event-detail e.id %}</guid>
+			<guid>{{base}}{% url team-event-detail e.first_team.lp_name e.id %}</guid>
 		</item>
 		{% endfor %}
 	</channel>

=== modified file 'loco_directory/templates/meetings/agenda_item_delete_confirm.html'
--- loco_directory/templates/meetings/agenda_item_delete_confirm.html	2011-01-23 15:20:31 +0000
+++ loco_directory/templates/meetings/agenda_item_delete_confirm.html	2011-03-18 13:41:34 +0000
@@ -5,7 +5,7 @@
 {% block title %}{% trans "Delete Agenda Item" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a>
+<a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a>
 {% endblock %}
 
 {% block extrahead %}{{ block.super }}

=== modified file 'loco_directory/templates/meetings/agenda_item_new.html'
--- loco_directory/templates/meetings/agenda_item_new.html	2011-01-22 16:05:24 +0000
+++ loco_directory/templates/meetings/agenda_item_new.html	2011-03-18 13:41:34 +0000
@@ -4,7 +4,7 @@
 {% block title %}{% trans "New Agenda Item" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a>
+<a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a>
 {% endblock %}
 
 {% block extrahead %}{{ block.super }}

=== modified file 'loco_directory/templates/meetings/agenda_item_update.html'
--- loco_directory/templates/meetings/agenda_item_update.html	2011-01-23 02:17:54 +0000
+++ loco_directory/templates/meetings/agenda_item_update.html	2011-03-18 13:41:34 +0000
@@ -4,7 +4,7 @@
 {% block title %}{% trans "Update Agenda Item" %} | {% trans "Ubuntu LoCo Team Directory" %} {% endblock %}
 
 {% block sub_nav_links %}
-<a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a>
+<a class="sub-nav-item" href="{% url team-meeting-detail team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Back to Meeting Details" %}</a>
 <a class="sub-nav-item" href="{% url agenda-item-delete team_meeting_object.id agenda_item_object.id %}">{% trans "Delete Agenda Item" %}</a>
 {% endblock %}
 

=== modified file 'loco_directory/templates/meetings/team_meeting_detail.html'
--- loco_directory/templates/meetings/team_meeting_detail.html	2010-12-24 14:18:40 +0000
+++ loco_directory/templates/meetings/team_meeting_detail.html	2011-03-18 13:41:34 +0000
@@ -7,12 +7,12 @@
 <a class="sub-nav-item" href="{% url meeting-list %}">{% trans "Back to Meetings List" %}</a>
 {% if user.is_authenticated %}
   {% if user_is_team_member %}
-    <a class="sub-nav-item" href="{% url team-meeting-update team_meeting_object.id %}">{% trans "Edit Details" %}</a>
-    <a class="sub-nav-item" href="{% url team-meeting-delete team_meeting_object.id %}">{% trans "Delete Meeting" %}</a>
-    <a class="sub-nav-item" href="{% url team-meeting-copy team_meeting_object.id %}">{% trans "Copy Meeting" %}</a>
+    <a class="sub-nav-item" href="{% url team-meeting-update team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Edit Details" %}</a>
+    <a class="sub-nav-item" href="{% url team-meeting-delete team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Delete Meeting" %}</a>
+    <a class="sub-nav-item" href="{% url team-meeting-copy team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "Copy Meeting" %}</a>
   {% endif %}
 {% endif %}
-<a class="sub-nav-item" href="{% url meeting-ical team_meeting_object.id %}">{% trans "iCal Feed" %}</a>
+<a class="sub-nav-item" href="{% url meeting-ical team_meeting_object.first_team.lp_name team_meeting_object.id %}">{% trans "iCal Feed" %}</a>
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/templates/meetings/team_meeting_li.inc.html'
--- loco_directory/templates/meetings/team_meeting_li.inc.html	2011-01-24 02:40:53 +0000
+++ loco_directory/templates/meetings/team_meeting_li.inc.html	2011-03-18 13:41:34 +0000
@@ -1,5 +1,5 @@
     {% load i18n %}
     {% comment %}TRANSLATORS: If event has a venue, show: date "in" city{% endcomment %}
     <li>
-        <a title="{{team_event.date_begin|date:"M d"}}" href="{% url team-meeting-detail team_event.id %}">{{ team_event.name }}</a> {% trans "on" %} {{ team_event.date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.date_begin|date:"H:i T" }}
+        <a title="{{team_event.date_begin|date:"M d"}}" href="{% url team-meeting-detail team_event.first_team.lp_name team_event.id %}">{{ team_event.name }}</a> {% trans "on" %} {{ team_event.date_begin|date:"l, d N Y" }} {% trans "at " %}{{ team_event.date_begin|date:"H:i T" }}
     </li>

=== modified file 'loco_directory/templates/meetings/team_meetings_rss.xml'
--- loco_directory/templates/meetings/team_meetings_rss.xml	2010-12-02 07:56:46 +0000
+++ loco_directory/templates/meetings/team_meetings_rss.xml	2011-03-18 13:41:34 +0000
@@ -8,7 +8,7 @@
 		{% for e in meetings %}
 		<item>
 			<title> {{ e.name }}</title>
-			<link>{{base}}{% url team-meeting-detail e.id %}</link>
+			<link>{{base}}{% url team-meeting-detail e.first_team.lp_name e.id %}</link>
 			<description>{% trans "When:" %} {% spaceless %}
 			{% ifequal e.date_begin|date e.date_end|date %}
 				{{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"H:i O" }}
@@ -16,7 +16,7 @@
 				{{ e.date_begin|date:"D, d N Y H:i" }} - {{ e.date_end|date:"D, d N Y H:i O" }}
 			{% endifequal %}
 			{% endspaceless %}</description>
-			<guid>{{base}}{% url team-meeting-detail e.id %}</guid>
+			<guid>{{base}}{% url team-meeting-detail e.first_team.lp_name e.id %}</guid>
 		</item>
 		{% endfor %}
 	</channel>

=== modified file 'loco_directory/templates/venues/venue_detail.html'
--- loco_directory/templates/venues/venue_detail.html	2011-02-17 17:54:09 +0000
+++ loco_directory/templates/venues/venue_detail.html	2011-03-18 13:41:34 +0000
@@ -11,7 +11,7 @@
 
 {% block sub_nav_links %}
 <a class="sub-nav-item" href="{% url venue-list %}" >{% trans "Back to Venues List" %}</a>
-<a class="sub-nav-item" href="{% url venue-update venue_object.id %}">{% trans "Edit Venue Details" %}</a>
+<a class="sub-nav-item" href="{% url venue-update venue_object.country venue_object.id %}">{% trans "Edit Venue Details" %}</a>
 {% endblock %}
 
 {% block content %}

=== modified file 'loco_directory/venues/models.py'
--- loco_directory/venues/models.py	2010-12-20 23:54:15 +0000
+++ loco_directory/venues/models.py	2011-03-18 13:41:34 +0000
@@ -44,7 +44,7 @@
     @models.permalink
     def get_absolute_url(self):
         """ get the absolute url for the venue """
-        return ('venue-detail', [self.id])
+        return ('venue-detail', [self.country or 'no-country', self.id])
 
     def get_timezone(self):
         try:

=== modified file 'loco_directory/venues/urls.py'
--- loco_directory/venues/urls.py	2009-12-21 20:45:43 +0000
+++ loco_directory/venues/urls.py	2011-03-18 13:41:34 +0000
@@ -3,8 +3,12 @@
 urlpatterns = patterns('',
     #venues
     url(r'^$', 'venues.views.venue_list', name='venue-list'),
-    url(r'^(?P<venue_id>\d+)/detail/$', 'venues.views.venue_detail', name='venue-detail'),
-    url(r'^(?P<venue_id>\d+)/update/$', 'venues.views.venue_update', name='venue-update'),
+    url(r'^(?P<country>[\w\s]+)/(?P<venue_id>\d+)/detail/$', 'venues.views.venue_detail', name='venue-detail'),
+    url(r'^(?P<country>[\w\s]+)/(?P<venue_id>\d+)/update/$', 'venues.views.venue_update', name='venue-update'),
     url(r'add/$', 'venues.views.venue_new', name='venue-new'),
-                      )
+    
+    # Old urls for compatibility
+    url(r'^(?P<venue_id>\d+)/detail/$', 'venues.views.venue_detail', kwargs={'country':''}),
+    url(r'^(?P<venue_id>\d+)/update/$', 'venues.views.venue_update', kwargs={'country':''}),
+)
 

=== modified file 'loco_directory/venues/views.py'
--- loco_directory/venues/views.py	2011-01-03 23:11:35 +0000
+++ loco_directory/venues/views.py	2011-03-18 13:41:34 +0000
@@ -32,7 +32,7 @@
     return render_to_response('venues/venue_list.html', context,
                   RequestContext(request))
 
-def venue_detail(request, venue_id):
+def venue_detail(request, country, venue_id):
     """
     detailed view for a venue
     """
@@ -59,7 +59,7 @@
                     # escape() calls force_unicode.
                     (escape(venue_object.pk), escape(venue_object)))
             else:
-                return HttpResponseRedirect(reverse('venue-detail', kwargs={'venue_id': new_venue_id}))
+                return HttpResponseRedirect(venue_object.get_absolute_url())
     else:
         form = VenueForm()
         
@@ -70,7 +70,7 @@
                                      context, RequestContext(request))
 
 @login_required
-def venue_update(request, venue_id):
+def venue_update(request, country, venue_id):
     """
  update venue
     """
@@ -81,7 +81,7 @@
         if form.is_valid():
             form.save()
             request.user.message_set.create(message=_('Venue updated'))
-            return HttpResponseRedirect( reverse( 'venue-detail', args=[venue_object.id] ) )
+            return HttpResponseRedirect(venue_object.get_absolute_url())
     else:
         form = VenueForm(instance=venue_object)