diff --git a/symposion/teams/urls.py b/symposion/teams/urls.py index 8445eed5b7e1e71c99a7d04fefc93f48c34d3edf..abe7803338645292407858d6d5a3ff7edbd65ea5 100644 --- a/symposion/teams/urls.py +++ b/symposion/teams/urls.py @@ -2,5 +2,5 @@ from django.conf.urls.defaults import * 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 index de657b317a675f72dca0971349a4d9b68f79529c..52cbfb23a5ce343295fa96d2e4dfd2ebd8351600 100644 --- a/symposion/teams/views.py +++ b/symposion/teams/views.py @@ -9,7 +9,7 @@ from symposion.teams.models import Team @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 index eefe7cc58e5c1ae67635fbf23ebc9732a296bd6c..170ae704aba3ef85ca41a059979f5ee7e15ab425 100644 --- a/symposion_project/templates/dashboard.html +++ b/symposion_project/templates/dashboard.html @@ -148,11 +148,12 @@ {% available_teams as available_teams %} {% if available_teams %}

Available Teams

- + {% endif %}