Merge lp:~mhall119/loco-team-portal/fixes-537563 into lp:loco-team-portal

[Michael Hall]

Adds a link to the Global Event details page (only if the current user is a team admin) to create a new Team Event for the given Global Event. This takes the user to the screen to add a team event (or team select screen if they are admin on more than one team), and populates the Global Event field for them.

[lp:~mhall119/loco-team-portal/fixes-537563]

70. By Michael Hall on 2010-03-12

Added next= parameter to login url so that users are always redirected back to the page they were on

71. By Michael Hall on 2010-03-15

Create Django groups for LP Teams

72. By Michael Hall on 2010-03-15

Create Django groups for LP Teams

73. By Michael Hall on 2010-03-15

Allow team members to create and edit team events

[Daniel Holbach (dholbach)]

Should this probably be updated to allow every team member to add stuff?

[lp:~mhall119/loco-team-portal/fixes-537563]

74. By Dave Walker on 2010-03-16

Removed rule.png reference in base.html as it has never existed, and doesn't seem to be required. (LP: #494594)

75. By Daniel Holbach on 2010-03-16

release 0.2.1

[Michael Hall (mhall119)]

Yes, I will update it and resubmit

[lp:~mhall119/loco-team-portal/fixes-537563]

76. By Michael Hall on 2010-03-16

Update from trunk

77. By Michael Hall on 2010-03-16

Updated check to see if user is a member of a team, not just the admin of a team

Unmerged revisions

=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2010-03-15 18:09:25 +0000
+++ loco_directory/events/views.py	2010-03-16 16:00:49 +0000
@@ -1,5 +1,5 @@
 from django.template import RequestContext
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.shortcuts import get_object_or_404
 from django.contrib.auth.decorators import login_required
@@ -135,9 +135,14 @@
         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)
+        from django.core import urlresolvers
+        url = urlresolvers.reverse('team-event-new', args=[teams[0].lp_name])
+        if request.GET.has_key('global_event_id'):
+            return HttpResponseRedirect('%s?global_event_id=%s' % (url, request.GET.get('global_event_id', None)))
+        else:
+            return HttpResponseRedirect(url)
     else:
-        context = {'teams': teams}
+        context = {'teams': teams, 'global_event_id': request.GET.get('global_event_id', None)}
         return render_to_response('events/team_event_new_select.html', context, RequestContext(request))
 
 def team_events_rss(request, team_slug):
@@ -181,7 +186,7 @@
                 request.user.message_set.create(message=_('New event created'))
                 return redirect( team_object )
         else:
-            form = TeamEventForm()
+            form = TeamEventForm(initial={'global_event':request.GET.get('global_event_id', None)})
         
         context = {
             'team_object': team_object,
@@ -294,6 +299,7 @@
     global_event_object = get_object_or_404(GlobalEvent, pk=global_event_id)
     context = {
         'global_event_object': global_event_object,
+        'add_team_event': Team.objects.filter(admins__lpid=request.user.username),
     }
     return render_to_response('events/global_event_detail.html', 
                                          context, RequestContext(request))
 
=== modified file 'loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html'
--- loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html	2010-01-10 20:39:23 +0000
+++ loco_directory/templates/events/global_event_detail_attending_teamevents.inc.html	2010-03-16 16:00:49 +0000
@@ -6,4 +6,7 @@
 		{% endfor %}
 </ul>
 {% endif %}
+{% if add_team_event %}
+<a href="{% url team-event-select %}?global_event_id={{global_event_object.id}}">{% trans "Add your Team's Event" %}</a>
+{% endif %}
 
 
=== modified file 'loco_directory/templates/events/team_event_new_select.html'
--- loco_directory/templates/events/team_event_new_select.html	2010-01-20 15:44:13 +0000
+++ loco_directory/templates/events/team_event_new_select.html	2010-03-16 16:00:49 +0000
@@ -6,7 +6,7 @@
 {% 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>
+<h2><a href="{%url team-event-new team.lp_name%}{% if global_event_id %}?global_event_id={{global_event_id}}{% endif %}">{{team.name}}</a></h2>
 {% endfor %}
 
 {% endblock %}