LoCo Team Portal

Merge lp:~mhall119/loco-team-portal/fix-510198 into lp:loco-team-portal

  1. fix-510198
  2. Merge into 0.2
Proposed by Michael Hall
Status: Merged
Merged at revision: not available
Proposed branch: lp:~mhall119/loco-team-portal/fix-510198
Merge into: lp:loco-team-portal
Prerequisite: lp:~mhall119/loco-team-portal/team-events-rss
Diff against target: 182 lines (+20/-20)
3 files modified
loco_directory/events/views.py (+15/-15)
loco_directory/teams/views.py (+3/-3)
loco_directory/venues/views.py (+2/-2)
To merge this branch: bzr merge lp:~mhall119/loco-team-portal/fix-510198
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+17760@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

For some reason, the translation's proxy object for the user.message_set message isn't being converted into a character string before being bound to the query. Wrapping all messages we pass to user.message_set.create in unicode() will pass the translated text as a unicode string rather than a proxy object.

The only drawback I can see from this is that we force the loading of the translation when we're passing it to message_set, but it would always get loaded very shortly thereafter anyway, so I don't see any real harm in doing this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'loco_directory/events/views.py'
--- loco_directory/events/views.py 2010-01-20 17:06:18 +0000
+++ loco_directory/events/views.py 2010-01-20 17:06:18 +0000
@@ -118,21 +118,21 @@
118 if is_on_lc or is_contact:118 if is_on_lc or is_contact:
119 if request.method == 'POST': 119 if request.method == 'POST':
120 team_event_object.delete()120 team_event_object.delete()
121 request.user.message_set.create(message=_('Team Event removed'))121 request.user.message_set.create(message=unicode(_('Team Event removed')))
122 return redirect( 'event-list' )122 return redirect( 'event-list' )
123 else:123 else:
124 context = {'team_event_object': team_event_object}124 context = {'team_event_object': team_event_object}
125 return render_to_response('events/team_event_delete_confirm.html', context, RequestContext(request))125 return render_to_response('events/team_event_delete_confirm.html', context, RequestContext(request))
126126
127 else:127 else:
128 request.user.message_set.create(message=_('You can not remove this team event.'))128 request.user.message_set.create(message=unicode(_('You can not remove this team event.')))
129 return redirect( team_event_object )129 return redirect( team_event_object )
130130
131@login_required131@login_required
132def team_event_select(request):132def team_event_select(request):
133 teams = Team.objects.filter(admins__lpid=request.user.username)133 teams = Team.objects.filter(admins__lpid=request.user.username)
134 if len(teams) == 0:134 if len(teams) == 0:
135 request.user.message_set.create(message=_('You can not add a new team event'))135 request.user.message_set.create(message=unicode(_('You can not add a new team event')))
136 return redirect( 'event-list' )136 return redirect( 'event-list' )
137 elif len(teams) == 1:137 elif len(teams) == 1:
138 return redirect('team-event-new', teams[0].lp_name)138 return redirect('team-event-new', teams[0].lp_name)
@@ -178,7 +178,7 @@
178 if form.is_valid():178 if form.is_valid():
179 team_event = form.save()179 team_event = form.save()
180 team_event.teams.add(team_object)180 team_event.teams.add(team_object)
181 request.user.message_set.create(message=_('New event created'))181 request.user.message_set.create(message=unicode(_('New event created')))
182 return redirect( team_object )182 return redirect( team_object )
183 else:183 else:
184 form = TeamEventForm()184 form = TeamEventForm()
@@ -190,7 +190,7 @@
190 return render_to_response('events/team_event_new.html', 190 return render_to_response('events/team_event_new.html',
191 context, RequestContext(request))191 context, RequestContext(request))
192 else:192 else:
193 request.user.message_set.create(message=_('You can not add a new event for this team.'))193 request.user.message_set.create(message=unicode(_('You can not add a new event for this team.')))
194 return redirect( team_object )194 return redirect( team_object )
195195
196@login_required196@login_required
@@ -211,7 +211,7 @@
211 form = TeamEventForm(data=request.POST, instance=team_event_object)211 form = TeamEventForm(data=request.POST, instance=team_event_object)
212 if form.is_valid():212 if form.is_valid():
213 form.save()213 form.save()
214 request.user.message_set.create(message=_('Team Event updated'))214 request.user.message_set.create(message=unicode(_('Team Event updated')))
215 return redirect( team_event_object )215 return redirect( team_event_object )
216 else:216 else:
217 form = TeamEventForm(instance=team_event_object)217 form = TeamEventForm(instance=team_event_object)
@@ -222,7 +222,7 @@
222 return render_to_response('events/team_event_update.html', 222 return render_to_response('events/team_event_update.html',
223 context, RequestContext(request))223 context, RequestContext(request))
224 else:224 else:
225 request.user.message_set.create(message=_('You can not update this team event.'))225 request.user.message_set.create(message=unicode(_('You can not update this team event.')))
226 return redirect( team_event_object )226 return redirect( team_event_object )
227227
228@login_required228@login_required
@@ -240,7 +240,7 @@
240 form = AttendeeRegistrationForm(instance=attendee_object, data=request.POST)240 form = AttendeeRegistrationForm(instance=attendee_object, data=request.POST)
241 if form.is_valid():241 if form.is_valid():
242 form.save()242 form.save()
243 request.user.message_set.create(message=_('Your registration has been saved'))243 request.user.message_set.create(message=unicode(_('Your registration has been saved')))
244 return redirect( team_event_object )244 return redirect( team_event_object )
245 else:245 else:
246 form = AttendeeRegistrationForm(instance=attendee_object, initial={'guests':0})246 form = AttendeeRegistrationForm(instance=attendee_object, initial={'guests':0})
@@ -266,7 +266,7 @@
266 team_event_comment.team_event = team_event_object266 team_event_comment.team_event = team_event_object
267 team_event_comment.comment_by = request.user267 team_event_comment.comment_by = request.user
268 team_event_comment.save()268 team_event_comment.save()
269 request.user.message_set.create(message=_('Comment saved.'))269 request.user.message_set.create(message=unicode(_('Comment saved.')))
270 return redirect( team_event_object )270 return redirect( team_event_object )
271 else:271 else:
272 form = TeamEventCommentForm()272 form = TeamEventCommentForm()
@@ -308,13 +308,13 @@
308 if is_on_lc:308 if is_on_lc:
309 if request.method == 'POST': 309 if request.method == 'POST':
310 global_event_object.delete()310 global_event_object.delete()
311 request.user.message_set.create(message=_('Global Event removed'))311 request.user.message_set.create(message=unicode(_('Global Event removed')))
312 return redirect( 'event-list' )312 return redirect( 'event-list' )
313 else:313 else:
314 context = {'global_event_object': global_event_object}314 context = {'global_event_object': global_event_object}
315 return render_to_response('events/global_event_delete_confirm.html', context, RequestContext(request))315 return render_to_response('events/global_event_delete_confirm.html', context, RequestContext(request))
316 else:316 else:
317 request.user.message_set.create(message=_('You can not remove this global event.'))317 request.user.message_set.create(message=unicode(_('You can not remove this global event.')))
318 return redirect( global_event_object )318 return redirect( global_event_object )
319319
320@login_required320@login_required
@@ -328,7 +328,7 @@
328 form = GlobalEventForm(data=request.POST)328 form = GlobalEventForm(data=request.POST)
329 if form.is_valid():329 if form.is_valid():
330 form.save()330 form.save()
331 request.user.message_set.create(message=_('New Global Event created'))331 request.user.message_set.create(message=unicode(_('New Global Event created')))
332 return redirect( 'event-list' )332 return redirect( 'event-list' )
333 else:333 else:
334 form = GlobalEventForm()334 form = GlobalEventForm()
@@ -339,7 +339,7 @@
339 return render_to_response('events/global_event_new.html', 339 return render_to_response('events/global_event_new.html',
340 context, RequestContext(request))340 context, RequestContext(request))
341 else:341 else:
342 request.user.message_set.create(message=_('You can not add a new global event.'))342 request.user.message_set.create(message=unicode(_('You can not add a new global event.')))
343 return redirect( 'event-list' )343 return redirect( 'event-list' )
344344
345@login_required345@login_required
@@ -355,7 +355,7 @@
355 form = GlobalEventForm(data=request.POST, instance=global_event_object)355 form = GlobalEventForm(data=request.POST, instance=global_event_object)
356 if form.is_valid():356 if form.is_valid():
357 form.save()357 form.save()
358 request.user.message_set.create(message=_('Global Event updated'))358 request.user.message_set.create(message=unicode(_('Global Event updated')))
359 return redirect( global_event_object )359 return redirect( global_event_object )
360 else:360 else:
361 form = GlobalEventForm(instance=global_event_object)361 form = GlobalEventForm(instance=global_event_object)
@@ -366,7 +366,7 @@
366 return render_to_response('events/global_event_update.html', 366 return render_to_response('events/global_event_update.html',
367 context, RequestContext(request))367 context, RequestContext(request))
368 else:368 else:
369 request.user.message_set.create(message=_('You can not update this global event.'))369 request.user.message_set.create(message=unicode(_('You can not update this global event.')))
370 return redirect( global_event_object )370 return redirect( global_event_object )
371371
372372
373373
=== modified file 'loco_directory/teams/views.py'
--- loco_directory/teams/views.py 2010-01-18 14:41:22 +0000
+++ loco_directory/teams/views.py 2010-01-20 17:06:18 +0000
@@ -78,7 +78,7 @@
78 if not is_on_lc and not is_contact:78 if not is_on_lc and not is_contact:
79 # FIXME: The message below should be translatable, but it breaks79 # FIXME: The message below should be translatable, but it breaks
80 # the <teams/<team>/edit links if you're not logged in.80 # the <teams/<team>/edit links if you're not logged in.
81 request.user.message_set.create(message='You are not allowed to make changes to the team details.')81 request.user.message_set.create(message=unicode(_('You are not allowed to make changes to the team details.')))
82 return redirect( team_object )82 return redirect( team_object )
8383
84 if request.method == "POST":84 if request.method == "POST":
@@ -88,10 +88,10 @@
88 form = forms.UpdateTeamForm(data=request.POST, instance=team_object)88 form = forms.UpdateTeamForm(data=request.POST, instance=team_object)
89 if form.is_valid():89 if form.is_valid():
90 form.save()90 form.save()
91 request.user.message_set.create(message=_('Team details updated'))91 request.user.message_set.create(message=unicode(_('Team details updated')))
92 return redirect( team_object )92 return redirect( team_object )
93 else:93 else:
94 request.user.message_set.create(message=_('Team details could not be saved.'))94 request.user.message_set.create(message=unicode(_('Team details could not be saved.')))
95 else:95 else:
96 if is_on_lc:96 if is_on_lc:
97 form = forms.LoCoCouncilForm(instance=team_object)97 form = forms.LoCoCouncilForm(instance=team_object)
9898
=== modified file 'loco_directory/venues/views.py'
--- loco_directory/venues/views.py 2010-01-18 14:41:22 +0000
+++ loco_directory/venues/views.py 2010-01-20 17:06:18 +0000
@@ -50,7 +50,7 @@
50 form = VenueForm(data=request.POST)50 form = VenueForm(data=request.POST)
51 if form.is_valid():51 if form.is_valid():
52 form.save()52 form.save()
53 request.user.message_set.create(message=_('New Venue created'))53 request.user.message_set.create(message=unicode(_('New Venue created')))
54 return HttpResponseRedirect( reverse( 'venue-list' ) )54 return HttpResponseRedirect( reverse( 'venue-list' ) )
55 else:55 else:
56 form = VenueForm()56 form = VenueForm()
@@ -72,7 +72,7 @@
72 form = VenueForm(data=request.POST, instance=venue_object)72 form = VenueForm(data=request.POST, instance=venue_object)
73 if form.is_valid():73 if form.is_valid():
74 form.save()74 form.save()
75 request.user.message_set.create(message=_('Venue updated'))75 request.user.message_set.create(message=unicode(_('Venue updated')))
76 return HttpResponseRedirect( reverse( 'venue-detail', args=[venue_object.id] ) )76 return HttpResponseRedirect( reverse( 'venue-detail', args=[venue_object.id] ) )
77 else:77 else:
78 form = VenueForm(instance=venue_object)78 form = VenueForm(instance=venue_object)

Subscribers

People subscribed via source and target branches