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

[Chris Johnston]

Removes the ability to edit the owner and admins. Makes LTP rely on the info from LP.

=== modified file 'loco_directory/teams/forms.py'
--- loco_directory/teams/forms.py	2011-07-22 20:09:29 +0000
+++ loco_directory/teams/forms.py	2012-03-04 21:06:20 +0000
@@ -10,7 +10,7 @@
 class UpdateTeamForm(forms.ModelForm, RenderableMixin):
     class Meta:
         model = Team
-        exclude = ('approved_date', 'approved', 'expires_date', 'name', 'lp_name', 'admins', 'owner', 'active', 'override_name')
+        exclude = ('approved_date', 'approved', 'expires_date', 'name', 'lp_name', 'admin_profiles', 'owner_profile', 'active', 'override_name')
 
     class Media:
         css = {'all': (
@@ -19,26 +19,8 @@
         js = (
               '/media/js/colortip-1.0-jquery.js',
               )
-              
-    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')
+        exclude = ('approved', 'expires_date', 'name', 'lp_name', 'admin_profiles', 'owner_profile', 'active')