Daniel Holbach has proposed merging lp:~dholbach/loco-directory/537563 into 
lp:loco-directory.

Requested reviews:
  loco-directory-dev (loco-directory-dev)

-- 
https://code.launchpad.net/~dholbach/loco-directory/537563/+merge/26417
Your team loco-directory-dev is requested to review the proposed merge of 
lp:~dholbach/loco-directory/537563 into lp:loco-directory.
=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py	2010-05-31 10:17:12 +0000
+++ loco_directory/events/views.py	2010-05-31 13:09:27 +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. You are not member of any of the LoCo Teams.'))
         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,
@@ -293,8 +298,11 @@
     detailed view for a global event
     """
     global_event_object = get_object_or_404(GlobalEvent, pk=global_event_id)
+    add_team_event = (request.user and \
+                      request.user.groups.exclude(name__exact='ubuntu-lococouncil'))
     context = {
         'global_event_object': global_event_object,
+        'add_team_event': add_team_event,
     }
     return render_to_response('events/global_event_detail.html', 
                                          context, RequestContext(request))

=== modified file 'loco_directory/templates/events/global_event_detail.inc.html'
--- loco_directory/templates/events/global_event_detail.inc.html	2010-05-04 14:38:29 +0000
+++ loco_directory/templates/events/global_event_detail.inc.html	2010-05-31 13:09:27 +0000
@@ -22,6 +22,10 @@
 		<h2>{% blocktrans with global_event_object.teamevent_set.all.count as team_count %}Attending Team Events ({{team_count}}){% endblocktrans %}</h2>
 		{% include "events/global_event_detail_attending_teamevents.inc.html" %}
         {% 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 %}
+
         <br class="clear" />
 
 </div>

=== 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-05-31 13:09:27 +0000
@@ -6,4 +6,3 @@
 		{% endfor %}
 </ul>
 {% 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-05-31 13:09:27 +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 %}

_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help   : https://help.launchpad.net/ListHelp

Reply via email to