properly link to and control access to team detail page

pinax · Aug 2, 2012 · 3998fe3 · 3998fe3
1 parent 40f4d1b
commit 3998fe3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/symposion/teams/urls.py b/symposion/teams/urls.py
@@ -2,5 +2,5 @@
 
 
 urlpatterns = patterns("symposion.teams.views",
-    url(r"^(\w+)/$", "team_detail", name="team_detail"),
+    url(r"^([\w\-]+)/$", "team_detail", name="team_detail"),
 )
diff --git a/symposion/teams/views.py b/symposion/teams/views.py
@@ -9,7 +9,7 @@
 @login_required
 def team_detail(request, slug):
     team = get_object_or_404(Team, slug=slug)
-    if team.get_state_for_user(request.user) != "manager":
+    if team.access == "invitation" and team.get_state_for_user(request.user) is None:
         raise Http404()
 
     return render(request, "teams/team_detail.html", {

diff --git a/symposion_project/templates/dashboard.html b/symposion_project/templates/dashboard.html
@@ -148,11 +148,12 @@ <h4>Your Teams</h4>
             {% available_teams as available_teams %}
             {% if available_teams %}
                 <h4>Available Teams</h4>
-                <ul>
+                <dl>
                     {% for team in available_teams %}
-                        <li>{{ team }} <span class="label">{{ team.get_access_display }}</span></li>
+                        <dt><a href="{% url team_detail team.slug %}">{{ team }}</a> <span class="label">{{ team.get_access_display }}</span></dt>
+                        {% if team.description %}<dd>{{ team.description }}</dd>{% endif %}
                     {% endfor %}
-                </ul>
+                </dl>
             {% endif %}
         </div>
     </div>