LoCo Team Portal

Merge lp:~ronnie.vd.c/loco-team-portal/697692-2 into lp:loco-team-portal

  1. 697692-2
  2. Merge into 0.2
Proposed by Ronnie
Status: Merged
Approved by: Michael Hall
Approved revision: 357
Merged at revision: 361
Proposed branch: lp:~ronnie.vd.c/loco-team-portal/697692-2
Merge into: lp:loco-team-portal
Diff against target: 102 lines (+14/-15)
3 files modified
loco_directory/events/views.py (+3/-3)
loco_directory/meetings/forms.py (+6/-6)
loco_directory/meetings/views.py (+5/-6)
To merge this branch: bzr merge lp:~ronnie.vd.c/loco-team-portal/697692-2
Reviewer Review Type Date Requested Status
LoCo Team Portal Developers Pending
Review via email: mp+45654@code.launchpad.net

Description of the change

Fixes team unlink when copy meeting or event

To post a comment you must log in.
lp:~ronnie.vd.c/loco-team-portal/697692-2 updated
357. By Ronnie

added teams= for meetingform to group users

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-01-05 16:01:17 +0000
3+++ loco_directory/events/views.py 2011-01-10 01:14:10 +0000
4@@ -229,21 +229,21 @@
5
6 team_event = get_object_or_404(TeamEvent, pk=team_event_id)
7 team_object = team_event.teams.all()[0]
8- team_event.id = team_event.pk = None
9
10 is_on_lc = launchpad.is_user_on_loco_council(request.user)
11 is_member = launchpad.is_team_member(request.user, team_object)
12
13 if is_on_lc or is_member:
14 if request.method == 'POST':
15- form = TeamEventForm(instance=team_event, data=request.POST, teams=team_event.teams.all())
16+ form = TeamEventForm(instance=team_event, data=request.POST, teams=team_event.teams.all().iterator())
17+ team_event.id = team_event.pk = None
18 if form.is_valid():
19 team_event = form.save()
20 team_event.teams.add(team_object)
21 request.user.message_set.create(message=_('New event created.'))
22 return redirect( team_object )
23 else:
24- form = TeamEventForm(instance=team_event, teams=team_event.teams.all())
25+ form = TeamEventForm(instance=team_event, teams=team_event.teams.all().iterator())
26
27 context = {
28 'team_object': team_object,
29
30=== modified file 'loco_directory/meetings/forms.py'
31--- loco_directory/meetings/forms.py 2011-01-05 15:50:08 +0000
32+++ loco_directory/meetings/forms.py 2011-01-10 01:14:10 +0000
33@@ -57,16 +57,16 @@
34 model = TeamMeeting
35 exclude = ('teams', 'date_created', 'logs')
36
37- def __init__(self, team=None, *args, **kargs):
38+ def __init__(self, teams=None, *args, **kargs):
39 super(TeamMeetingForm, self).__init__(*args, **kargs)
40- if team:
41- self.fields['chair'].choices = self.grouped_user_list([team])
42- self.fields['channel'].initial = team.irc_chan
43+ if teams:
44+ self.fields['chair'].choices = self.grouped_user_list(teams)
45+ self.fields['channel'].initial = teams[0].irc_chan
46 elif self.instance:
47- teams = [team for team in self.instance.teams.all()]
48- self.fields['chair'].choices = self.grouped_user_list(teams)
49+ self.fields['chair'].choices = self.grouped_user_list(teams.iterator())
50
51 def grouped_user_list(self, teams):
52+ print dir(teams)
53 other_members, team_members = [], []
54 for profile in UserProfile.objects.filter(user__groups__name__in=teams):
55 team_members.append((profile.id, str(profile)))
56
57=== modified file 'loco_directory/meetings/views.py'
58--- loco_directory/meetings/views.py 2011-01-05 16:47:48 +0000
59+++ loco_directory/meetings/views.py 2011-01-10 01:14:10 +0000
60@@ -174,14 +174,14 @@
61
62 if is_on_lc or is_member:
63 if request.method == 'POST':
64- form = TeamMeetingForm(data=request.POST, team=team_object)
65+ form = TeamMeetingForm(data=request.POST, teams=[team_object])
66 if form.is_valid():
67 team_meeting = form.save()
68 team_meeting.teams.add(team_object)
69 team_meeting_id = team_meeting.id
70 return HttpResponseRedirect(reverse('team-meeting-detail', kwargs={'team_meeting_id': team_meeting_id}))
71 else:
72- form = TeamMeetingForm(team=team_object)
73+ form = TeamMeetingForm(teams=[team_object])
74
75 context = {
76 'team_object': team_object,
77@@ -202,22 +202,21 @@
78
79 team_meeting = get_object_or_404(TeamMeeting, pk=team_meeting_id)
80 team_object = team_meeting.teams.all()[0]
81- team_meeting.id = team_meeting.pk = None
82- team_meeting.save()
83
84 is_on_lc = launchpad.is_user_on_loco_council(request.user)
85 is_member = launchpad.is_team_member(request.user, team_object)
86
87 if is_on_lc or is_member:
88 if request.method == 'POST':
89- form = TeamMeetingForm(instance=team_meeting, data=request.POST)
90+ form = TeamMeetingForm(instance=team_meeting, data=request.POST, teams=team_meeting.teams.all())
91+ team_meeting.id = team_meeting.pk = None
92 if form.is_valid():
93 team_meeting = form.save()
94 team_meeting.teams.add(team_object)
95 request.user.message_set.create(message=_('New meeting created.'))
96 return redirect( team_object )
97 else:
98- form = TeamMeetingForm(instance=team_meeting)
99+ form = TeamMeetingForm(instance=team_meeting, teams=team_meeting.teams.all())
100
101 context = {
102 'team_object': team_object,

Subscribers

People subscribed via source and target branches