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

[Ronnie]

owner, admin and contact profiles in team_edit are now grouped (optgroups) in "Team members" (the members in the team that is edited) and "Other members"

This makes it easier to assign the right people

[Chris Johnston (cjohnston)]

"Other members" should be renamed. They aren't members. Also, the meeting chair needs to be included in this.

review: Needs Fixing

[lp:~ronnie.vd.c/loco-team-portal/627492]

346. By Ronnie on 2010-12-19

Sorting Team_members/other_members now works also in meetings.chair

[Ronnie (ronnie.vd.c)]

"Other members" is now renamed to "Other users"

[lp:~ronnie.vd.c/loco-team-portal/627492]

347. By Ronnie on 2010-12-23

Changed 'Other members' to 'Other users'

[Chris Johnston (cjohnston)]

If there is no user assigned, it needs to default null. Example: when creating a meeting, it should default to ----- or something similar.. Currently it defaults to the first user of the team.

review: Needs Fixing

[lp:~ronnie.vd.c/loco-team-portal/627492]

348. By Ronnie on 2011-01-03

Default is now '---------'

349. By Ronnie on 2011-01-03

less '----'. the amount is now equal as on other parts of the website

[Chris Johnston (cjohnston)]

Based upon our conversation on IRC, leave the null on contacts, however remove the null on owner and admin please.

review: Needs Fixing

[Ronnie (ronnie.vd.c)]

The contacts box does not need a null in my opinion. Its a multi selectbox, where you can select nothing. Currently the field does not allow 'null' so that should be fixed in the model and form, but not by adding a '---------' field

[Chris Johnston (cjohnston)]

There is still '----' on all fields on the team details page.

review: Needs Fixing

[Ronnie (ronnie.vd.c)]

Committed the changes. It should be solved now

review: Resubmit

[lp:~ronnie.vd.c/loco-team-portal/627492]

350. By Ronnie on 2011-01-05

Teams edit page: renmoved '--------'

351. By Ronnie on 2011-01-05

Added default teams channel to the meeting page

=== modified file 'loco_directory/meetings/forms.py'
--- loco_directory/meetings/forms.py	2010-12-06 01:51:30 +0000
+++ loco_directory/meetings/forms.py	2011-01-05 13:41:37 +0000
@@ -6,6 +6,7 @@
 
 from models import BaseMeeting, TeamMeeting
 from common.forms import RenderableMixin
+from userprofiles.models import UserProfile
 
 import pytz
 
@@ -38,12 +39,14 @@
         self.fields['date_begin'].widget = forms.SplitDateTimeWidget()
         self.fields['date_end'].widget = forms.SplitDateTimeWidget()
         
+        
     def clean(self):
         begin = self.cleaned_data.get('date_begin')
         end = self.cleaned_data.get('date_end')
         if begin and end and begin > end:
             raise forms.ValidationError("Meetings can not end before they start.")
         return self.cleaned_data
+        
 
 class TeamMeetingForm(BaseMeetingForm):
     """ 
@@ -52,3 +55,23 @@
     class Meta(BaseMeetingForm.Meta):
         model = TeamMeeting
         exclude = ('teams', 'date_created')
+        
+    def __init__(self, team=None, *args, **kargs):
+        super(TeamMeetingForm, self).__init__(*args, **kargs)
+        if team:
+            self.fields['chair'].choices = self.grouped_user_list([team])
+            self.fields['channel'].initial = team.irc_chan
+        elif self.instance:
+            teams = [team for team in self.instance.teams.all()]
+            self.fields['chair'].choices = self.grouped_user_list(teams)
+        
+    def grouped_user_list(self, teams):
+        other_members, team_members = [], []
+        for profile in UserProfile.objects.filter(user__groups__name__in=teams):
+            team_members.append((profile.id, str(profile)))
+        for profile in UserProfile.objects.all().exclude(user__groups__name__in=teams):
+            other_members.append((profile.id, str(profile)))
+        return [('', '---------'),
+                (_('Team members'), team_members),
+                (_('Other users'), other_members)]
+        

=== modified file 'loco_directory/meetings/views.py'
--- loco_directory/meetings/views.py	2010-12-06 16:22:09 +0000
+++ loco_directory/meetings/views.py	2011-01-05 13:41:37 +0000
@@ -173,14 +173,14 @@
     
     if is_on_lc or is_member:
         if request.method == 'POST':
-            form = TeamMeetingForm(data=request.POST)
+            form = TeamMeetingForm(data=request.POST, team=team_object)
             if form.is_valid():
                 team_meeting = form.save()
                 team_meeting.teams.add(team_object)
                 request.user.message_set.create(message=_('New meeting created.'))
                 return redirect( team_object )
         else:
-            form = TeamMeetingForm()
+            form = TeamMeetingForm(team=team_object)
                 
         context = {
             'team_object': team_object,

=== modified file 'loco_directory/teams/forms.py'
--- loco_directory/teams/forms.py	2010-11-20 17:40:31 +0000
+++ loco_directory/teams/forms.py	2011-01-05 13:41:37 +0000
@@ -4,6 +4,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from models import Team
+from userprofiles.models import UserProfile
 from common.forms import RenderableMixin
 
 class UpdateTeamForm(forms.ModelForm, RenderableMixin):
@@ -18,18 +19,28 @@
         js = (
               '/media/js/colortip-1.0-jquery.js',
               )
-
-class LoCoCouncilForm(forms.ModelForm, RenderableMixin):
-    class Meta:
+              
+    def __init__(self, *args, **kwargs):
+        super(UpdateTeamForm, self).__init__(*args, **kwargs)
+        user_list = self.grouped_user_list()
+        self.fields['owner_profile'].choices = user_list
+        self.fields['admin_profiles'].choices = user_list
+        self.fields['contact_profiles'].choices = user_list
+        
+    def grouped_user_list(self):
+        other_members, team_members = [], []
+        for profile in UserProfile.objects.filter(user__groups__name__exact=self.instance.lp_name):
+            team_members.append((profile.id, str(profile)))
+        for profile in UserProfile.objects.all().exclude(user__groups__name__exact=self.instance.lp_name):
+            other_members.append((profile.id, str(profile)))
+
+        return [(_('Team members'), team_members),
+                (_('Other users'), other_members)]
+
+
+class LoCoCouncilForm(UpdateTeamForm, RenderableMixin):
+    class Meta(UpdateTeamForm.Meta):
         model = Team
         exclude = ('approved', 'expires_date', 'name', 'lp_name', 'admins', 'owner', 'active')
 
-    class Media:
-        css = {'all': (
-                       '/media/css/colortip-1.0-jquery.css', 
-                       )}
-        js = (
-              '/media/js/colortip-1.0-jquery.js',
-              )
-