damned-lies r1216 - in trunk: . languages people stats teams templates

[stephaner svn gnome org]

Author: stephaner
Date: Sun Dec 14 23:34:58 2008
New Revision: 1216
URL: http://svn.gnome.org/viewvc/damned-lies?rev=1216&view=rev

Log:
2008-12-15  StÃphane Raimbault  <stephane raimbault gmail com>

	* languages/views.py: Just a \n!
	* people/models.py: Added is_committer, is_reviewer and
	is_translator methods.	
	* people/urls.py: Add a FIXME
	* stats/views.py: Removed profiler loading (time_spent not called)
	* teams/models.py:
	* teams/views.py: Fix typo commiter -> committer
	* templates/module_list.html: Removed spaces.


Modified:
   trunk/ChangeLog
   trunk/languages/views.py
   trunk/people/models.py
   trunk/people/urls.py
   trunk/stats/views.py
   trunk/teams/models.py
   trunk/teams/views.py
   trunk/templates/module_list.html

Modified: trunk/languages/views.py
==============================================================================
--- trunk/languages/views.py	(original)
+++ trunk/languages/views.py	Sun Dec 14 23:34:58 2008
@@ -36,7 +36,8 @@
         'pageSection': "languages",
         'languages': utils.trans_sort_object_list(languages, 'name')
     }
-    return render_to_response('languages/language_list.html', context, context_instance=RequestContext(request))
+    return render_to_response('languages/language_list.html', context,
+                              context_instance=RequestContext(request))
 
 def language_release(request, locale, release_name):
     language = get_object_or_404(Language, locale=Language.unslug_locale(locale))
@@ -48,7 +49,8 @@
         'release': release,
         'stats': stats
     }
-    return render_to_response('languages/language_release.html', context, context_instance=RequestContext(request))
+    return render_to_response('languages/language_release.html', context,
+                              context_instance=RequestContext(request))
 
 def language_release_tar(request, locale, release_name, dtype):
     release = get_object_or_404(Release, name=release_name)

Modified: trunk/people/models.py
==============================================================================
--- trunk/people/models.py	(original)
+++ trunk/people/models.py	Sun Dec 14 23:34:58 2008
@@ -20,7 +20,7 @@
 
     # Use UserManager to get the create_user method, etc.
     objects = UserManager()
-       
+
     class Meta:
         db_table = 'person'
         ordering = ('username',)
@@ -57,6 +57,27 @@
     def get_absolute_url(self):
         return ('person', [str(self.id)])
 
+    def is_committer(self, team):
+        try:
+            self.role_set.get(team=team, role='committer')
+            return True
+        except:
+            return False
+
+    def is_reviewer(self, team):
+        try:
+            self.role_set.get(team=team, role='reviewer')
+            return True
+        except:
+            return False
+
+    def is_translator(self, team):
+        try:
+            self.role_set.get(team=team, role='translator')
+            return True
+        except:
+            return False
+
     # Related names
     # - module: maintains_modules
     # - team: coordinates_teams

Modified: trunk/people/urls.py
==============================================================================
--- trunk/people/urls.py	(original)
+++ trunk/people/urls.py	Sun Dec 14 23:34:58 2008
@@ -13,5 +13,6 @@
     url(r'^$', 'django.views.generic.list_detail.object_list', dict(info_dict_list), 'persons'),                    
     url(r'^(?P<object_id>\d+)/$', 'people.views.person_detail_from_id', name='person'),
     # equivalent to the previous, but using username instead of user pk
-    url(r'^(?P<slug>\w+)/$', 'people.views.person_detail_from_username', name='person'),
+    # FIXME The name isn't unique ('person')!
+    url(r'^(?P<slug>\w+)/$', 'people.views.person_detail_from_username', name='person')
 )

Modified: trunk/stats/views.py
==============================================================================
--- trunk/stats/views.py	(original)
+++ trunk/stats/views.py	Sun Dec 14 23:34:58 2008
@@ -47,7 +47,6 @@
         'pageSection':  "module",
         'module': mod,
         'can_edit_branches': mod.can_edit_branches(request.user),
-        'prof': utils.Profiler()
     }
     return render_to_response('module_detail.html', context, context_instance=RequestContext(request))
 

Modified: trunk/teams/models.py
==============================================================================
--- trunk/teams/models.py	(original)
+++ trunk/teams/models.py	Sun Dec 14 23:34:58 2008
@@ -56,8 +56,8 @@
         members = Person.objects.filter(role__team=self, role__role=role)
         return members
         
-    def get_commiters(self):
-        return self.get_members_by_role('commiter')
+    def get_committers(self):
+        return self.get_members_by_role('committer')
 
     def get_reviewers(self):
         return self.get_members_by_role('reviewer')
@@ -102,4 +102,3 @@
     class Meta:
         db_table = 'role'
         unique_together = ('team', 'person')
-

Modified: trunk/teams/views.py
==============================================================================
--- trunk/teams/views.py	(original)
+++ trunk/teams/views.py	Sun Dec 14 23:34:58 2008
@@ -42,10 +42,10 @@
     except:
         lang = get_object_or_404(Language, locale=team_slug)
         team = FakeTeam(lang)
-    mem_groups = ( {'title': _("Commiters"),
-                'members': team.get_commiters(),
+    mem_groups = ( {'title': _("Committers"),
+                'members': team.get_committers(),
                 'form': None,
-                'no_member': _("No commiters")
+                'no_member': _("No committers")
                },
                {'title': _("Reviewers"),
                 'members': team.get_reviewers(),
@@ -75,7 +75,7 @@
                             role.role = form_value
                             role.save()
         # Create forms for template
-        commit_roles = Role.objects.filter(team=team, role='commiter')
+        commit_roles = Role.objects.filter(team=team, role='committer')
         if commit_roles:
             mem_groups[0]['form'] = EditMemberRoleForm(commit_roles)
         review_roles = Role.objects.filter(team=team, role='reviewer')

Modified: trunk/templates/module_list.html
==============================================================================
--- trunk/templates/module_list.html	(original)
+++ trunk/templates/module_list.html	Sun Dec 14 23:34:58 2008
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %} {% trans "GNOME Modules" %} {% endblock %}
+{% block title %}{% trans "GNOME Modules" %}{% endblock %}
 
 {% block content %}
 <div class="mainpage">