Merge lp:~mhall119/loco-team-portal/fix-509675-and-add-team-event into lp:loco-team-portal

[Michael Hall]

[Michael Hall (mhall119)]

To make the interface more intuitive, I added a link on the Events page to add a new Team Event. If the user is not listed as an admin on any team, they are told they cannot add a new team event, and redirected to the events list. If they are the admin on more than one team, they are shown a list of team links they can add an Event for. If they are the admin on only one team, they are redirected to that team's add event page.

[Daniel Holbach (dholbach)]

Good work!

review: Approve

=== modified file 'loco_directory/events/urls.py'
--- loco_directory/events/urls.py	2010-01-11 22:24:24 +0000
+++ loco_directory/events/urls.py	2010-01-20 15:47:13 +0000
@@ -12,6 +12,7 @@
     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_slug>[a-zA-Z0-9\-\.\+?]+)/add/$', 'events.views.team_event_new', name='team-event-new'),
+    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'),

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2010-01-18 14:41:22 +0000
+++ loco_directory/events/views.py	2010-01-20 15:47:13 +0000
@@ -127,6 +127,18 @@
         return redirect( team_event_object )
 
 @login_required
+def team_event_select(request):
+    teams = Team.objects.filter(admins__lpid=request.user.username)
+    if len(teams) == 0:
+        request.user.message_set.create(message=_('You can not add a new team event'))
+        return redirect( 'event-list' )
+    elif len(teams) == 1:
+        return redirect('team-event-new', teams[0].lp_name)
+    else:
+        context = {'teams': teams}
+        return render_to_response('events/team_event_new_select.html', context, RequestContext(request))
+
+@login_required
 def team_event_new(request, team_slug):
     """
     new team event
@@ -189,6 +201,7 @@
         request.user.message_set.create(message=_('You can not update this team event.'))
         return redirect( team_event_object )
 
+@login_required
 def team_event_register(request, team_event_id):
     """
     register as attendee for a team event

=== modified file 'loco_directory/templates/events/event_list.html'
--- loco_directory/templates/events/event_list.html	2010-01-11 22:24:24 +0000
+++ loco_directory/templates/events/event_list.html	2010-01-20 15:47:13 +0000
@@ -24,6 +24,9 @@
 
 <h1>{% trans "Ubuntu LoCo Team Events" %}{% if team_event_list %} <a title="{% trans "Team Events as ical" %}" class="team_event_ical" href="{% url team-event-list-ical %}"></a>{% endif %}</h1>
 {% if team_event_list %}
+{% if user.is_authenticated %}
+		<p><b><a href="{% url team-event-select %}">{% trans "Add new Team Event." %}</a></b></p>
+{% endif %}
 <p>{% trans "Select a team event below to see more information about it:" %}</p>
 
 {% include "events/team_event_list.inc.html" %}

=== modified file 'loco_directory/templates/events/team_event_detail_attendees.inc.html'
--- loco_directory/templates/events/team_event_detail_attendees.inc.html	2010-01-11 12:41:30 +0000
+++ loco_directory/templates/events/team_event_detail_attendees.inc.html	2010-01-20 15:47:13 +0000
@@ -1,15 +1,11 @@
 {% load i18n %}
 <table>
 <tr><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>
 {% else %}
 <a href="{% url team-event-register team_event_object.id %}">{% trans 'Register for this Event' %}</a>
 {% endif %}
-{% else %}
-{% blocktrans %}You must <a href="/openid/login">log in</a> to register for this event.{% endblocktrans %}
-{% endif %}
 </td></tr>
 </table>
 {% if team_event_object.attendee_set.all %}

=== modified file 'loco_directory/templates/events/team_event_new.html'
--- loco_directory/templates/events/team_event_new.html	2010-01-04 17:22:52 +0000
+++ loco_directory/templates/events/team_event_new.html	2010-01-20 15:47:13 +0000
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block content %}
-<h1>{% trans "Add new Team Event" %}</h1>
+<h1>{% trans "Add new Team Event for " %}{{ team_object.name}}</h1>
 <form action="." method="post">
     	<table>
         	{{ form.as_table }}

=== added file 'loco_directory/templates/events/team_event_new_select.html'
--- loco_directory/templates/events/team_event_new_select.html	1970-01-01 00:00:00 +0000
+++ loco_directory/templates/events/team_event_new_select.html	2010-01-20 15:47:13 +0000
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+{% load i18n %}
+
+{% block title %}{% trans "New Team Event" %}{% endblock %}
+
+{% block content %}
+<h1>{% trans "Select a Team to add an Event for" %}</h1>
+{% for team in teams %}
+<h2><a href="{%url team-event-new team.lp_name%}">{{team.name}}</a></h2>
+{% endfor %}
+
+{% endblock %}