MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replacing is_authenticated() with is_authenticated for Django upgrade.

Browse Source 
Signed-off-by: Amber Elliot <amber.n.elliot@intel.com>
Signed-off-by: Paul Eggleton <bluelightning@bluelightning.org>
This commit is contained in:
Amber Elliot 2020-06-25 15:57:36 -07:00 committed by Paul Eggleton
parent 4e35c18f94
commit 7482d57175
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layerindex/auth_views.py
View File

@ -77,7 +77,7 @@ class CaptchaPasswordResetView(PasswordResetView):
def delete_account_view(request, template_name): def delete_account_view(request, template_name):
if not request.user.is_authenticated(): if not request.user.is_authenticated:
raise PermissionDenied raise PermissionDenied
if request.user.is_superuser: if request.user.is_superuser:
# It's not really appropriate for the superuser to be deleted this way # It's not really appropriate for the superuser to be deleted this way

2
layerindex/forms.py
View File

@ -89,7 +89,7 @@ class EditLayerForm(StyledModelForm):
del self.fields['captcha'] del self.fields['captcha']
else: else:
self.fields['deps'].initial = [l.pk for l in LayerItem.objects.filter(name=settings.CORE_LAYER_NAME)] self.fields['deps'].initial = [l.pk for l in LayerItem.objects.filter(name=settings.CORE_LAYER_NAME)]
if user.is_authenticated(): if user.is_authenticated:
del self.fields['captcha'] del self.fields['captcha']
# Ensure repo subdir appears after repo URL # Ensure repo subdir appears after repo URL
field_order = list(self.fields.keys()) field_order = list(self.fields.keys())

2
layerindex/models.py
View File

@ -171,7 +171,7 @@ class LayerItem(models.Model):
return matches return matches
def user_can_edit(self, user): def user_can_edit(self, user):
if user.is_authenticated(): if user.is_authenticated:
user_email = user.email.strip().lower() user_email = user.email.strip().lower()
for maintainer in self.active_maintainers(): for maintainer in self.active_maintainers():
if maintainer.email.strip().lower() == user_email: if maintainer.email.strip().lower() == user_email:

30
layerindex/views.py
View File

@ -65,7 +65,7 @@ def edit_layernote_view(request, template_name, slug, pk=None):
layeritem = get_object_or_404(LayerItem, name=slug) layeritem = get_object_or_404(LayerItem, name=slug)
if layeritem.comparison: if layeritem.comparison:
raise Http404 raise Http404
if not (request.user.is_authenticated() and (request.user.has_perm('layerindex.publish_layer') or layeritem.user_can_edit(request.user))): if not (request.user.is_authenticated and (request.user.has_perm('layerindex.publish_layer') or layeritem.user_can_edit(request.user))):
raise PermissionDenied raise PermissionDenied
if pk: if pk:
# Edit mode # Edit mode
@ -91,7 +91,7 @@ def delete_layernote_view(request, template_name, slug, pk):
layeritem = get_object_or_404(LayerItem, name=slug) layeritem = get_object_or_404(LayerItem, name=slug)
if layeritem.comparison: if layeritem.comparison:
raise Http404 raise Http404
if not (request.user.is_authenticated() and (request.user.has_perm('layerindex.publish_layer') or layeritem.user_can_edit(request.user))): if not (request.user.is_authenticated and (request.user.has_perm('layerindex.publish_layer') or layeritem.user_can_edit(request.user))):
raise PermissionDenied raise PermissionDenied
layernote = get_object_or_404(LayerNote, pk=pk) layernote = get_object_or_404(LayerNote, pk=pk)
if request.method == 'POST': if request.method == 'POST':
@ -108,7 +108,7 @@ def delete_layer_view(request, template_name, slug):
layeritem = get_object_or_404(LayerItem, name=slug) layeritem = get_object_or_404(LayerItem, name=slug)
if layeritem.comparison: if layeritem.comparison:
raise Http404 raise Http404
if not (request.user.is_authenticated() and request.user.has_perm('layerindex.publish_layer') and layeritem.status == 'N'): if not (request.user.is_authenticated and request.user.has_perm('layerindex.publish_layer') and layeritem.status == 'N'):
raise PermissionDenied raise PermissionDenied
if request.method == 'POST': if request.method == 'POST':
layeritem.delete() layeritem.delete()
@ -128,7 +128,7 @@ def edit_layer_view(request, template_name, branch='master', slug=None):
layeritem = get_object_or_404(LayerItem, name=slug) layeritem = get_object_or_404(LayerItem, name=slug)
if layeritem.comparison: if layeritem.comparison:
raise Http404 raise Http404
if not (request.user.is_authenticated() and (request.user.has_perm('layerindex.publish_layer') or layeritem.user_can_edit(request.user))): if not (request.user.is_authenticated and (request.user.has_perm('layerindex.publish_layer') or layeritem.user_can_edit(request.user))):
raise PermissionDenied raise PermissionDenied
layerbranch = get_object_or_404(LayerBranch, layer=layeritem, branch=branchobj) layerbranch = get_object_or_404(LayerBranch, layer=layeritem, branch=branchobj)
old_maintainers = list(layerbranch.layermaintainer_set.values_list('email', flat=True)) old_maintainers = list(layerbranch.layermaintainer_set.values_list('email', flat=True))
@ -324,7 +324,7 @@ def _get_help_contact():
return help_contact return help_contact
def publish_view(request, name): def publish_view(request, name):
if not (request.user.is_authenticated() and request.user.has_perm('layerindex.publish_layer')): if not (request.user.is_authenticated and request.user.has_perm('layerindex.publish_layer')):
raise PermissionDenied raise PermissionDenied
if getattr(settings, 'SEND_PUBLISH_EMAIL', True): if getattr(settings, 'SEND_PUBLISH_EMAIL', True):
@ -412,7 +412,7 @@ class LayerDetailView(DetailView):
if l.comparison: if l.comparison:
raise Http404 raise Http404
if l.status == 'N': if l.status == 'N':
if not (request.user.is_authenticated() and request.user.has_perm('layerindex.publish_layer')): if not (request.user.is_authenticated and request.user.has_perm('layerindex.publish_layer')):
raise PermissionDenied raise PermissionDenied
return res return res
@ -695,7 +695,7 @@ class BulkChangeView(CreateView):
return super(BulkChangeView, self).dispatch(request, *args, **kwargs) return super(BulkChangeView, self).dispatch(request, *args, **kwargs)
def form_valid(self, form): def form_valid(self, form):
if not self.request.user.is_authenticated(): if not self.request.user.is_authenticated:
raise PermissionDenied raise PermissionDenied
obj = form.save(commit=False) obj = form.save(commit=False)
obj.user = self.request.user obj.user = self.request.user
@ -717,7 +717,7 @@ class BulkChangeSearchView(AdvancedRecipeSearchView):
return super(BulkChangeSearchView, self).get(request, *args, **kwargs) return super(BulkChangeSearchView, self).get(request, *args, **kwargs)
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
if not request.user.is_authenticated(): if not request.user.is_authenticated:
raise PermissionDenied raise PermissionDenied
changeset = get_object_or_404(RecipeChangeset, pk=kwargs['pk']) changeset = get_object_or_404(RecipeChangeset, pk=kwargs['pk'])
@ -1346,7 +1346,7 @@ class ClassicRecipeDetailView(SuccessMessageMixin, DetailView):
context_object_name = 'recipe' context_object_name = 'recipe'
def _can_edit(self): def _can_edit(self):
if self.request.user.is_authenticated(): if self.request.user.is_authenticated:
if not self.request.user.has_perm('layerindex.edit_classic'): if not self.request.user.has_perm('layerindex.edit_classic'):
return False return False
else: else:
@ -1354,7 +1354,7 @@ class ClassicRecipeDetailView(SuccessMessageMixin, DetailView):
return True return True
def _can_disposition_patches(self): def _can_disposition_patches(self):
if self.request.user.is_authenticated(): if self.request.user.is_authenticated:
if not self.request.user.has_perm('layerindex.patch_disposition'): if not self.request.user.has_perm('layerindex.patch_disposition'):
return False return False
else: else:
@ -1550,7 +1550,7 @@ class TaskStatusView(TemplateView):
def task_log_view(request, task_id): def task_log_view(request, task_id):
from celery.result import AsyncResult from celery.result import AsyncResult
if not request.user.is_authenticated(): if not request.user.is_authenticated:
raise PermissionDenied raise PermissionDenied
if '/' in task_id: if '/' in task_id:
@ -1601,7 +1601,7 @@ def task_log_view(request, task_id):
def task_stop_view(request, task_id): def task_stop_view(request, task_id):
from celery.result import AsyncResult from celery.result import AsyncResult
import signal import signal
if not request.user.is_authenticated(): if not request.user.is_authenticated:
raise PermissionDenied raise PermissionDenied
result = AsyncResult(task_id) result = AsyncResult(task_id)
@ -1610,7 +1610,7 @@ def task_stop_view(request, task_id):
def email_test_view(request): def email_test_view(request):
if not request.user.is_authenticated() and request.user.is_staff(): if not request.user.is_authenticated and request.user.is_staff():
raise PermissionDenied raise PermissionDenied
plaintext = get_template('layerindex/testemail.txt') plaintext = get_template('layerindex/testemail.txt')
@ -1639,7 +1639,7 @@ def email_test_view(request):
class ComparisonRecipeSelectView(ClassicRecipeSearchView): class ComparisonRecipeSelectView(ClassicRecipeSearchView):
def _can_edit(self): def _can_edit(self):
if self.request.user.is_authenticated(): if self.request.user.is_authenticated:
if not self.request.user.has_perm('layerindex.edit_classic'): if not self.request.user.has_perm('layerindex.edit_classic'):
return False return False
else: else:
@ -1713,7 +1713,7 @@ class ComparisonRecipeSelectDetailView(DetailView):
return context return context
def post(self, request, *args, **kwargs): def post(self, request, *args, **kwargs):
if not request.user.is_authenticated(): if not request.user.is_authenticated:
raise PermissionDenied raise PermissionDenied
recipe = get_object_or_404(ClassicRecipe, pk=self.kwargs['selectfor']) recipe = get_object_or_404(ClassicRecipe, pk=self.kwargs['selectfor'])