Merge lp:~doctormo/loco-team-portal/previous-used-venues into lp:loco-team-portal

[Martin Owens]

Add in a previously-used venue section into the create-new event screen. Also added a create-event link to the event-list screen to help UI.

Add in a previously-used venue section into the create-new event screen.

Also added a create-event link to the event-list screen to help UI.

[Michael Hall (mhall119)]

Environment:

Request Method: GET
Request URL: http://127.0.0.1:8000/events/ubuntu-us-florida/add/
Django Version: 1.1.2
Python Version: 2.6.6
Installed Applications:
['django.contrib.auth',
 'django.contrib.contenttypes',
 'django.contrib.sessions',
 'django.contrib.admin',
 'common',
 'teams',
 'venues',
 'events',
 'meetings',
 'userprofiles',
 'django_openid_auth',
 'south',
 'bzr_apps']
Installed Middleware:
('django.middleware.common.CommonMiddleware',
 'django.middleware.locale.LocaleMiddleware',
 'django.contrib.sessions.middleware.SessionMiddleware',
 'django.contrib.auth.middleware.AuthenticationMiddleware')

Traceback:
File "/home/mhall/projects/Ubuntu/locodir/work/.env/lib/python2.6/site-packages/django/core/handlers/base.py" in get_response
  99. response = callback(request, *callback_args, **callback_kwargs)
File "/home/mhall/projects/Ubuntu/locodir/work/.env/lib/python2.6/site-packages/django/contrib/auth/decorators.py" in __call__
  78. return self.view_func(request, *args, **kwargs)
File "/home/mhall/projects/Ubuntu/locodir/work/loco_directory/events/views.py" in team_event_new
  209. form = TeamEventForm(initial={'global_event':request.GET.get('global_event_id', None)}, teams=[team_object])
File "/home/mhall/projects/Ubuntu/locodir/work/loco_directory/events/forms.py" in __init__
  69. self.fields['venue'].choices = self.grouped_venue_list()
File "/home/mhall/projects/Ubuntu/locodir/work/loco_directory/events/forms.py" in grouped_venue_list
  103. previous_choice.append((event.venue.id, str(event.venue)))

Exception Type: AttributeError at /events/ubuntu-us-florida/add/
Exception Value: 'NoneType' object has no attribute 'id'

review: Needs Fixing

[lp:~doctormo/loco-team-portal/previous-used-venues]

437. By Martin Owens on 2011-06-17

Allow events with no venue.

[Chris Johnston (cjohnston)]

<h2>{% blocktrans with team_object.lp_name as teamname %}There are currently no events for this team.{% endblocktrans %}

There is no reason to have the with if you are taking out the specification of a team in the text.

review: Needs Fixing

[Martin Owens (doctormo)]

Both issues have been fixed and commits pushed.

review: Needs Resubmitting

[lp:~doctormo/loco-team-portal/previous-used-venues]

438. By Martin Owens on 2011-06-17

Removed 'with' statement which is now useless.

[Martin Owens (doctormo)]

review: Approve

[Chris Johnston (cjohnston)]

Looks good!

review: Approve

=== modified file 'loco_directory/events/forms.py'
--- loco_directory/events/forms.py	2011-02-17 21:24:49 +0000
+++ loco_directory/events/forms.py	2011-06-17 23:12:35 +0000
@@ -90,9 +90,22 @@
         in a way that Django will convert to OptGroups
         """
         venue_choices = [('', '---------')]
+        previous_venues = []
+        previous_choice = []
         country_choices = []
         current_country = ''
-        
+
+        # Have a look for previously used event venues
+        team_events = TeamEvent.objects.filter(teams__lp_name__in=self.teams)
+        for event in team_events:
+            if event.venue and event.venue not in previous_venues:
+                previous_venues.append(event.venue)
+                previous_choice.append((event.venue.id, str(event.venue)))
+
+        # Add a previously used menu list if required.
+        if previous_venues:
+            venue_choices.insert(1, (_("Previously Used"), previous_choice))
+
         # Show the venues which belong the the 'current team' first. then show the other countries
         venues_team = Venue.objects.filter(country__team__in=self.teams).order_by('country', 'spr', 'city')
         venues_other = Venue.objects.all().exclude(country__team__in=self.teams).order_by('country', 'spr', 'city')
@@ -101,6 +114,9 @@
         # Ordered by country so we can tell when we're done with one
         # and starting another
         for venue in venues:
+            # Ignore the venue if we've added it before.
+            if venue in previous_venues:
+                continue
             # If this venue has a different country, start a new group
             if venue.country != current_country:
                 # Add the old group to the list if it's non-empty
@@ -110,6 +126,7 @@
                 current_country = venue.country
             # Add venue to the current country group
             country_choices.append((venue.id, str(venue)))
+
         
         # Add the last country group to the list if it's non-empty
         if len(country_choices) > 0:

=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py	2011-02-26 02:09:43 +0000
+++ loco_directory/teams/views.py	2011-06-17 23:12:35 +0000
@@ -104,9 +104,13 @@
     """
     team_object = get_object_or_404(Team, lp_name=team_slug)
     team_event_list = team_object.teamevent_set.next_events()
+    is_member = False
+    if request.user.is_authenticated():
+        is_member = launchpad.is_team_member(request.user, team_object)
     context = {
         'team_object': team_object,
         'team_event_list': team_event_list,
+        'is_member' : is_member,
     }
     return render_to_response('teams/team_event_list.html', context,
                   RequestContext(request))

=== modified file 'loco_directory/templates/teams/team_event_list.html'
--- loco_directory/templates/teams/team_event_list.html	2010-11-20 17:25:50 +0000
+++ loco_directory/templates/teams/team_event_list.html	2011-06-17 23:12:35 +0000
@@ -7,6 +7,7 @@
 <a class="sub-nav-item" href="{% url team-detail team_object.lp_name %}">{% trans "Back to Team Details" %}</a>
 <a class="sub-nav-item" href="{% url team-event-history team_object.lp_name %}">{% trans "Past Events" %}</a>
 <a class="sub-nav-item" href="{% url team-events-rss team_object.lp_name %}" title="{% trans "Team Events (RSS)" %}"">{% trans "Team Events (RSS)" %}</a>
+{% if is_member %}<a class="sub-nav-item" href="{% url team-event-new team_object.lp_name %}" title="{% trans "Add New Event" %}">{% trans "Add New Event" %}</a>{% endif %}
 {% endblock %}
 
 
@@ -26,9 +27,10 @@
 {% include "events/team_event_list.inc.html" %}
 
 {% else %}
-<p>{% blocktrans with team_object.lp_name as teamname %}There are currently no Events for LoCo Team {{teamname}} :({% endblocktrans %}</p>
+<h2>{% blocktrans %}There are currently no events for this team.{% endblocktrans %}</h2>
 {% endif %}
 
 
+
 </article>
 {% endblock %}