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

Proposed by Martin Owens
Status: Merged
Approved by: Chris Johnston
Approved revision: 438
Merged at revision: 435
Proposed branch: lp://staging/~doctormo/loco-team-portal/previous-used-venues
Merge into: lp://staging/loco-team-portal
Diff against target: 87 lines (+25/-2)
3 files modified
loco_directory/events/forms.py (+18/-1)
loco_directory/teams/views.py (+4/-0)
loco_directory/templates/teams/team_event_list.html (+3/-1)
To merge this branch: bzr merge lp://staging/~doctormo/loco-team-portal/previous-used-venues
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Martin Owens (community) Approve
Michael Hall (community) Needs Fixing
Review via email: mp+65071@code.staging.launchpad.net

Commit message

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.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

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
437. By Martin Owens

Allow events with no venue.

Revision history for this message
Chris Johnston (cjohnston) wrote :

<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
Revision history for this message
Martin Owens (doctormo) wrote :

Both issues have been fixed and commits pushed.

review: Needs Resubmitting
438. By Martin Owens

Removed 'with' statement which is now useless.

Revision history for this message
Martin Owens (doctormo) :
review: Approve
Revision history for this message
Chris Johnston (cjohnston) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches