From: <win...@us...> - 2009-01-13 16:26:20
|
Revision: 9658 http://translate.svn.sourceforge.net/translate/?rev=9658&view=rev Author: winterstream Date: 2009-01-13 16:26:14 +0000 (Tue, 13 Jan 2009) Log Message: ----------- Two bugs: 1. Didn't import adminpages as I should have. 2. Forgot that request may be None in the getrights method. Modified Paths: -------------- src/trunk/Pootle/pootle_app/views/language/view.py src/trunk/Pootle/projects.py Modified: src/trunk/Pootle/pootle_app/views/language/view.py =================================================================== --- src/trunk/Pootle/pootle_app/views/language/view.py 2009-01-13 16:23:45 UTC (rev 9657) +++ src/trunk/Pootle/pootle_app/views/language/view.py 2009-01-13 16:26:14 UTC (rev 9658) @@ -24,7 +24,7 @@ from django.http import HttpResponse, HttpResponseRedirect, HttpResponsePermanentRedirect from django.contrib.auth.decorators import user_passes_test -from Pootle import indexpage, pan_app, translatepage, projects +from Pootle import indexpage, pan_app, translatepage, projects, adminpages from Pootle.misc.jtoolkit_django import process_django_request_args from pootle_app.views.util import render_to_kid Modified: src/trunk/Pootle/projects.py =================================================================== --- src/trunk/Pootle/projects.py 2009-01-13 16:23:45 UTC (rev 9657) +++ src/trunk/Pootle/projects.py 2009-01-13 16:26:14 UTC (rev 9658) @@ -217,9 +217,9 @@ # use Django's permissions system. # if isinstance(session, InternalAdminSession): # return [right for right, localizedright in self.getrightnames(session)] - def get_username(user): - if user.is_authenticated(): - return user.username + def get_username(request): + if request is not None and request.user.is_authenticated(): + return request.user.username else: return "nobody" @@ -227,7 +227,7 @@ right = Right.objects.get(user__username=username, project__id=self.project_id) return [perm.codename for perm in right.permissions_set] - username = get_username(request.user) + username = get_username(request) tp = self.db_translation_project if tp.right_set.count() > 0: rights = [perm.codename for perm in tp.right_set.all()] @@ -248,7 +248,7 @@ #rights = getattr(rightstree, "default", None) else: return rights - if request.user.is_superuser: + if request is not None and request.user.is_superuser: if "admin" not in rights: rights.append("admin") return rights This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |