damned-lies r1283 - in trunk: . teams

[claudep svn gnome org]

Author: claudep
Date: Wed Dec 31 14:45:06 2008
New Revision: 1283
URL: http://svn.gnome.org/viewvc/damned-lies?rev=1283&view=rev

Log:
2008-12-31  Claude Paroz  <claude 2xlibre net>

	* teams/forms.py: Exclude 'coordinator' from role popup.
	* teams/models.py: Add 'coordinator' in role choices.
	* teams/views.py: Compare username instead of objects, because User !=
	Person.

Modified:
   trunk/ChangeLog
   trunk/teams/forms.py
   trunk/teams/models.py
   trunk/teams/views.py

Modified: trunk/teams/forms.py
==============================================================================
--- trunk/teams/forms.py	(original)
+++ trunk/teams/forms.py	Wed Dec 31 14:45:06 2008
@@ -5,7 +5,7 @@
 
     def __init__(self, roles, *args, **kwargs):
         super(EditMemberRoleForm, self).__init__(*args, **kwargs)
-        choices = list(ROLE_CHOICES)
+        choices = list(ROLE_CHOICES[:-1]) # exclude last element: coordinator
         choices.append(('remove','Remove From Team'))
         for role in roles:
             self.fields[str(role.pk)] = forms.ChoiceField(choices=choices,

Modified: trunk/teams/models.py
==============================================================================
--- trunk/teams/models.py	(original)
+++ trunk/teams/models.py	Wed Dec 31 14:45:06 2008
@@ -130,6 +130,7 @@
     ('translator', ugettext_lazy('Translator')),
     ('reviewer', ugettext_lazy('Reviewer')),
     ('committer', ugettext_lazy('Committer')),
+    ('coordinator', ugettext_lazy('Coordinator')),
 )
 
 class Role(models.Model):

Modified: trunk/teams/views.py
==============================================================================
--- trunk/teams/views.py	(original)
+++ trunk/teams/views.py	Wed Dec 31 14:45:06 2008
@@ -61,7 +61,8 @@
         team = FakeTeam(lang)
         mem_groups = ()
 
-    if request.user.is_authenticated() and request.user == team.get_coordinator():
+    # Compare username because request.user is User and get_coordinator is Person
+    if request.user.is_authenticated() and request.user.username == team.get_coordinator().username:
         if request.method == 'POST':
             form_type = request.POST['form_type']
             roles = Role.objects.filter(team=team, role=form_type)