LoCo Team Portal

Merge lp:~cjohnston/loco-team-portal/722570 into lp:loco-team-portal

  1. 722570
  2. Merge into 0.2
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 407
Merged at revision: 409
Proposed branch: lp:~cjohnston/loco-team-portal/722570
Merge into: lp:loco-team-portal
Diff against target: 120 lines (+13/-13)
2 files modified
loco_directory/events/views.py (+5/-5)
loco_directory/meetings/views.py (+8/-8)
To merge this branch: bzr merge lp:~cjohnston/loco-team-portal/722570
Reviewer Review Type Date Requested Status
Ronnie (community) Approve
Review via email: mp+50844@code.launchpad.net

Description of the change

Fixes problem described in bug as well as some other issues that were found.

To post a comment you must log in.
Revision history for this message
Ronnie (ronnie.vd.c) wrote :

Good to go

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loco_directory/events/views.py'
2--- loco_directory/events/views.py 2011-02-22 02:53:01 +0000
3+++ loco_directory/events/views.py 2011-02-23 01:09:57 +0000
4@@ -144,14 +144,14 @@
5 return render_to_response('events/team_event_delete_confirm.html', context, RequestContext(request))
6
7 else:
8- request.user.message_set.create(message='%s %s' % (_('You can not remove this team event.'), _('You are not admin/owner of the Launchpad team or on the LoCo Council.')))
9+ request.user.message_set.create(message='%s %s' % (_('You can not remove this team event.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.')))
10 return redirect( team_event_object )
11
12 @login_required
13 def team_event_select(request):
14 teams = Team.objects.filter(lp_name__in=[g.name for g in request.user.groups.all()])
15 if len(teams) == 0:
16- request.user.message_set.create(message='%s %s' % (_('You can not add a new team event.'), _('You are not member of any of the LoCo Teams.')))
17+ request.user.message_set.create(message='%s %s' % (_('You can not add a new team event.'), _('You are not a member of any LoCo Teams.')))
18 return redirect( 'event-list' )
19 elif len(teams) == 1:
20 from django.core import urlresolvers
21@@ -219,7 +219,7 @@
22 context, RequestContext(request))
23 else:
24 # XXX: Once we move to a new ACL system, this needs fixing.
25- request.user.message_set.create(message='%s %s' % (_('You can not add a new event for this team.'), _('You are not member of the team or on the LoCo Council.')))
26+ request.user.message_set.create(message='%s %s' % (_('You can not add a new event for this team.'), _('You are not a member of the team or on the LoCo Council.')))
27 return redirect( team_object )
28
29 @login_required
30@@ -254,7 +254,7 @@
31 context, RequestContext(request))
32 else:
33 # XXX: Once we move to a new ACL system, this needs fixing.
34- request.user.message_set.create(message='%s %s' % (_('You can not add a new event for this team.'), _('You are not member of the team or on the LoCo Council.')))
35+ request.user.message_set.create(message='%s %s' % (_('You can not add a new event for this team.'), _('You are not a member of the team or on the LoCo Council.')))
36 return redirect( team_object )
37
38 @login_required
39@@ -288,7 +288,7 @@
40 return render_to_response('events/team_event_update.html',
41 context, RequestContext(request))
42 else:
43- request.user.message_set.create(message='%s %s' % (_('You can not update this team event.'), _('You are not member of the team or on the LoCo Council.')))
44+ request.user.message_set.create(message='%s %s' % (_('You can not update this team event.'), _('You are not a member of the team or on the LoCo Council.')))
45 return redirect( team_event_object )
46
47 @login_required
48
49=== modified file 'loco_directory/meetings/views.py'
50--- loco_directory/meetings/views.py 2011-02-22 02:53:01 +0000
51+++ loco_directory/meetings/views.py 2011-02-23 01:09:57 +0000
52@@ -127,14 +127,14 @@
53 return render_to_response('meetings/team_meeting_delete_confirm.html', context, RequestContext(request))
54
55 else:
56- request.user.message_set.create(message='%s %s' % (_('You can not remove this team meeting.'), _('You are not admin/owner of the Launchpad team or on the LoCo Council.')))
57+ request.user.message_set.create(message='%s %s' % (_('You can not remove this team meeting.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.')))
58 return redirect( team_meeting_object )
59
60 @login_required
61 def team_meeting_select(request):
62 teams = Team.objects.filter(lp_name__in=[g.name for g in request.user.groups.all()])
63 if len(teams) == 0:
64- request.user.message_set.create(message='%s %s' % (_('You can not remove this team meeting.'), _('You are not member of any of the LoCo Teams.')))
65+ request.user.message_set.create(message='%s %s' % (_('You can not remove this team meeting.'), _('You are not a member of any LoCo Teams.')))
66 return redirect( 'meeting-list' )
67 elif len(teams) == 1:
68 from django.core import urlresolvers
69@@ -197,7 +197,7 @@
70 context, RequestContext(request))
71 else:
72 # XXX: Once we move to a new ACL system, this needs fixing.
73- request.user.message_set.create(message='%s %s' % (_('You can not add a new meeting for this team.'), _('You are not member of the team or on the LoCo Council.')))
74+ request.user.message_set.create(message='%s %s' % (_('You can not add a new meeting for this team.'), _('You are not a member of the team or on the LoCo Council.')))
75 return redirect( team_object )
76
77 @login_required
78@@ -232,7 +232,7 @@
79 context, RequestContext(request))
80 else:
81 # XXX: Once we move to a new ACL system, this needs fixing.
82- request.user.message_set.create(message='%s %s' % (_('You can not add a new meeting for this team.'), _('You are not member of the team or on the LoCo Council.')))
83+ request.user.message_set.create(message='%s %s' % (_('You can not add a new meeting for this team.'), _('You are not a member of the team or on the LoCo Council.')))
84 return redirect( team_object )
85
86 @login_required
87@@ -266,7 +266,7 @@
88 return render_to_response('meetings/team_meeting_update.html',
89 context, RequestContext(request))
90 else:
91- request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting.'), _('You are not member of the team or on the LoCo Council.')))
92+ request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting.'), _('You are not a member of the team or on the LoCo Council.')))
93 return redirect( team_meeting_object )
94
95 @login_required
96@@ -308,7 +308,7 @@
97 context, RequestContext(request))
98 else:
99 # XXX: Once we move to a new ACL system, this needs fixing.
100- request.user.message_set.create(message='%s %s' % (_('You can not add a new agenda item for this team meeting.'), _('You are not member of the team or on the LoCo Council.')))
101+ request.user.message_set.create(message='%s %s' % (_('You can not add a new agenda item for this team meeting.'), _('You are not a member of the team or on the LoCo Council.')))
102 return redirect( team_meeting_object )
103
104 @login_required
105@@ -345,7 +345,7 @@
106 return render_to_response('meetings/agenda_item_update.html',
107 context, RequestContext(request))
108 else:
109- request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting agenda.'), _('You are not member of the team or on the LoCo Council.')))
110+ request.user.message_set.create(message='%s %s' % (_('You can not update this team meeting agenda.'), _('You are not a member of the team or on the LoCo Council.')))
111 return redirect( team_meeting_object )
112
113 @login_required
114@@ -376,5 +376,5 @@
115 return render_to_response('meetings/agenda_item_delete_confirm.html', context, RequestContext(request))
116
117 else:
118- request.user.message_set.create(message='%s %s' % (_('You can not remove this agenda item.'), _('You are not admin/owner of the Launchpad team or on the LoCo Council.')))
119+ request.user.message_set.create(message='%s %s' % (_('You can not remove this agenda item.'), _('You are not an admin/owner of the Launchpad team or on the LoCo Council.')))
120 return redirect( team_meeting_object )

Subscribers

People subscribed via source and target branches