Commit 2a3de146 authored by Weblate's avatar Weblate

Merge remote-tracking branch 'origin/bootstrap' into bootstrap

parents 3934ae67 8e7b4c67
...@@ -38,15 +38,19 @@ def weblate_context(request): ...@@ -38,15 +38,19 @@ def weblate_context(request):
else: else:
login_redirect_url = request.get_full_path() login_redirect_url = request.get_full_path()
projects = Project.objects.all_acl(request.user)
# Load user translations if user is authenticated # Load user translations if user is authenticated
usertranslations = None usertranslations = None
if request.user.is_authenticated(): if request.user.is_authenticated():
usertranslations = Translation.objects.filter( usertranslations = Translation.objects.filter(
language__in=request.user.profile.languages.all() language__in=request.user.profile.languages.all(),
subproject__project__in=projects,
).order_by( ).order_by(
'subproject__project__name', 'subproject__name' 'subproject__project__name', 'subproject__name'
).select_related() ).select_related()
return { return {
'version': weblate.VERSION, 'version': weblate.VERSION,
...@@ -72,6 +76,6 @@ def weblate_context(request): ...@@ -72,6 +76,6 @@ def weblate_context(request):
'whiteboard_enabled': appsettings.ENABLE_WHITEBOARD, 'whiteboard_enabled': appsettings.ENABLE_WHITEBOARD,
'registration_open': appsettings.REGISTRATION_OPEN, 'registration_open': appsettings.REGISTRATION_OPEN,
'acl_projects': Project.objects.all_acl(request.user), 'acl_projects': projects,
'usertranslations': usertranslations, 'usertranslations': usertranslations,
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment