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

[Adnane Belmadiaf]

[Chris Johnston (cjohnston)]

Could you please expand this to work with meetings also?

[lp:~daker/loco-team-portal/fix.681984]

349. By Adnane Belmadiaf on 2011-01-05

* Redirect the user to meeting details after we create it

350. By Adnane Belmadiaf on 2011-01-05

* Fixed the url name

[Chris Johnston (cjohnston)]

raceback:
File "/usr/lib/pymodules/python2.6/django/core/handlers/base.py" in get_response
  100. response = callback(request, *callback_args, **callback_kwargs)
File "/usr/lib/pymodules/python2.6/django/contrib/auth/decorators.py" in _wrapped_view
  25. return view_func(request, *args, **kwargs)
File "/home/chris/Dropbox/Projects/loco-directory/loco-directory/loco_directory/meetings/views.py" in team_meeting_new
  181. return HttpResponseRedirect(reverse('team-meeting-detail', kwargs={'team_meeting_id': team_meeting_id}))

Exception Type: NameError at /meetings/team/ubuntu-us-florida/add/
Exception Value: global name 'reverse' is not defined

review: Needs Fixing

[lp:~daker/loco-team-portal/fix.681984]

351. By Adnane Belmadiaf on 2011-01-05

* Forgot to import reverse

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2010-12-30 19:46:26 +0000
+++ loco_directory/events/views.py	2011-01-05 15:59:18 +0000
@@ -4,6 +4,7 @@
 from django.shortcuts import 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
 
 from events.models import TeamEvent
 from events.models import GlobalEvent
@@ -201,8 +202,8 @@
             if form.is_valid():
                 team_event = form.save()
                 team_event.teams.add(team_object)
-                request.user.message_set.create(message=_('New event created.'))
-                return redirect( team_object )
+                team_event_id = team_event.id 
+                return HttpResponseRedirect(reverse('team-event-detail', kwargs={'team_event_id': team_event_id}))
         else:
             form = TeamEventForm(initial={'global_event':request.GET.get('global_event_id', None)}, teams=[team_object])
             if request.GET.has_key('global_event_id'):

=== modified file 'loco_directory/meetings/views.py'
--- loco_directory/meetings/views.py	2010-12-19 20:26:12 +0000
+++ loco_directory/meetings/views.py	2011-01-05 15:59:18 +0000
@@ -4,6 +4,7 @@
 from django.shortcuts import 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
 
 from meetings.models import TeamMeeting
 from teams.models import Team
@@ -177,8 +178,8 @@
             if form.is_valid():
                 team_meeting = form.save()
                 team_meeting.teams.add(team_object)
-                request.user.message_set.create(message=_('New meeting created.'))
-                return redirect( team_object )
+                team_meeting_id = team_meeting.id 
+                return HttpResponseRedirect(reverse('team-meeting-detail', kwargs={'team_meeting_id': team_meeting_id}))
         else:
             form = TeamMeetingForm(team=team_object)
                 

=== modified file 'loco_directory/venues/views.py'
--- loco_directory/venues/views.py	2010-11-20 17:40:31 +0000
+++ loco_directory/venues/views.py	2011-01-05 15:59:18 +0000
@@ -52,14 +52,14 @@
     if request.method == 'POST':		
         form = VenueForm(data=request.POST, instance=venue_object)
         if form.is_valid():
-            form.save()
-            request.user.message_set.create(message=_('New Venue created'))
+            new_venue = form.save()
+            new_venue_id = new_venue.id
             if request.REQUEST.has_key('_popup'):
                 return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' % \
                     # escape() calls force_unicode.
                     (escape(venue_object.pk), escape(venue_object)))
             else:
-                return HttpResponseRedirect( reverse( 'venue-list' ) )
+                return HttpResponseRedirect(reverse('venue-detail', kwargs={'venue_id': new_venue_id}))
     else:
         form = VenueForm()