Commit 00d32d3c authored by Michal Čihař's avatar Michal Čihař

Pass user to is_user_locked method

Signed-off-by: default avatarMichal Čihař <michal@cihar.com>
parent 40f121f7
......@@ -278,11 +278,11 @@ class Translation(models.Model, URLMixin, PercentMixin, LoggerMixin):
provided.
'''
return (
self.is_user_locked(request) or
self.is_user_locked(request.user) or
self.subproject.locked
)
def is_user_locked(self, request=None):
def is_user_locked(self, user=None):
'''
Checks whether there is valid user lock on this translation.
'''
......@@ -298,7 +298,7 @@ class Translation(models.Model, URLMixin, PercentMixin, LoggerMixin):
return False
# Is current user the one who has locked?
elif request is not None and self.lock_user == request.user:
elif user is not None and self.lock_user == user:
return False
else:
......
......@@ -512,7 +512,7 @@ def translate(request, project, subproject, lang):
translation = get_translation(request, project, subproject, lang)
# Check locks
user_locked = translation.is_user_locked(request)
user_locked = translation.is_user_locked(request.user)
project_locked = translation.subproject.locked
own_lock = translation.lock_user == request.user
locked = project_locked or user_locked
......
......@@ -33,7 +33,7 @@ from weblate.trans.views.helper import (
def lock_translation(request, project, subproject, lang):
obj = get_translation(request, project, subproject, lang)
if not obj.is_user_locked(request):
if not obj.is_user_locked(request.user):
obj.create_lock(request.user, True)
messages.success(request, _('Translation is now locked for you.'))
......@@ -44,7 +44,7 @@ def lock_translation(request, project, subproject, lang):
def update_lock(request, project, subproject, lang):
obj = get_translation(request, project, subproject, lang)
if not obj.is_user_locked(request):
if not obj.is_user_locked(request.user):
obj.update_lock_time()
return HttpResponse('ok')
......@@ -54,7 +54,7 @@ def update_lock(request, project, subproject, lang):
def unlock_translation(request, project, subproject, lang):
obj = get_translation(request, project, subproject, lang)
if not obj.is_user_locked(request):
if not obj.is_user_locked(request.user):
obj.create_lock(None)
messages.success(
request,
......
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