Merge lp:~dholbach/loco-team-portal/fix-494433 into lp:~ltp-devs/loco-team-portal/trunk

[Daniel Holbach]

[Dave Walker (davewalker)]

Works as expected.

review: Approve

=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py	2009-12-04 08:51:48 +0000
+++ loco_directory/teams/views.py	2009-12-09 13:55:20 +0000
@@ -89,7 +89,7 @@
             message = _("Team details could not be saved.")
         return common.views.versioned_render('teams/team_update.html', 
                       {'form': form,
-                       'team':team, 
+                       'team':team_object, 
                        'user':request.user, 
                        'message':message })
     if is_on_lc:
@@ -99,7 +99,7 @@
     logging.debug("%s %s - LC: %s, Contact: %s, normal view" % (teamedit_slug, request.user, str(is_on_lc), str(is_contact)))
     return common.views.versioned_render('teams/team_update.html', 
                     {'form': form, 
-                     'team':team, 
+                     'team':team_object, 
                      'user':request.user, 
                     })
 

=== modified file 'loco_directory/templates/teams/team_update.html'
--- loco_directory/templates/teams/team_update.html	2009-06-30 10:20:36 +0000
+++ loco_directory/templates/teams/team_update.html	2009-12-09 13:55:20 +0000
@@ -6,6 +6,7 @@
 {% block content %}
 
 <p><b><a href="/teams">{% trans "Go back to Team list." %}</a></b></p>
+<p><b><a href="/teams/{{ team.lp_name }}">{% trans "Go back to team details." %}</a></b></p>
 <div id="form">
     {% if message %}
 	<div class="box">