Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix RemovedInDjango20Warning for is_authenticated

Scott Peshak0725273fd4fe
diff --git a/wger/core/views/misc.py b/wger/core/views/misc.py
index df653fecc..3cfca149d 100644
--- a/wger/core/views/misc.py
+++ b/wger/core/views/misc.py
@@ -61,7 +61,7 @@ def index(request):
'''
Index page
'''
- if request.user.is_authenticated():
+ if request.user.is_authenticated:
return HttpResponseRedirect(reverse('core:dashboard'))
else:
return HttpResponseRedirect(reverse('software:features'))
@@ -74,11 +74,11 @@ def demo_entries(request):
if not settings.WGER_SETTINGS['ALLOW_GUEST_USERS']:
return HttpResponseRedirect(reverse('software:features'))
- if (((not request.user.is_authenticated() or request.user.userprofile.is_temporary)
+ if (((not request.user.is_authenticated or request.user.userprofile.is_temporary)
and not request.session['has_demo_data'])):
# If we reach this from a page that has no user created by the
# middleware, do that now
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
user = create_temporary_user()
django_login(request, user)
@@ -167,7 +167,7 @@ class FeedbackClass(FormView):
'''
Fill in the contact, if available
'''
- if self.request.user.is_authenticated():
+ if self.request.user.is_authenticated:
return {'contact': self.request.user.email}
return {}
@@ -190,7 +190,7 @@ class FeedbackClass(FormView):
Load the correct feedback form depending on the user
(either with reCaptcha field or not)
'''
- if self.request.user.is_anonymous() or self.request.user.userprofile.is_temporary:
+ if self.request.user.is_anonymous or self.request.user.userprofile.is_temporary:
return FeedbackAnonymousForm
else:
return FeedbackRegisteredForm
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 92020ba41..ca9fa48bb 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -212,7 +212,7 @@ def logout(request):
'''
user = request.user
django_logout(request)
- if user.is_authenticated() and user.userprofile.is_temporary:
+ if user.is_authenticated and user.userprofile.is_temporary:
user.delete()
return HttpResponseRedirect(reverse('core:user:login'))
@@ -238,7 +238,7 @@ def registration(request):
FormClass = RegistrationFormNoCaptcha
# Redirect regular users, in case they reached the registration page
- if request.user.is_authenticated() and not request.user.userprofile.is_temporary:
+ if request.user.is_authenticated and not request.user.userprofile.is_temporary:
return HttpResponseRedirect(reverse('core:dashboard'))
if request.method == 'POST':
@@ -348,7 +348,7 @@ class UserDeactivateView(LoginRequiredMixin,
'''
edit_user = get_object_or_404(User, pk=self.kwargs['pk'])
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
if (request.user.has_perm('gym.manage_gym') or request.user.has_perm('gym.gym_trainer')) \
@@ -381,7 +381,7 @@ class UserActivateView(LoginRequiredMixin,
'''
edit_user = get_object_or_404(User, pk=self.kwargs['pk'])
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
if (request.user.has_perm('gym.manage_gym') or request.user.has_perm('gym.gym_trainer')) \
@@ -419,7 +419,7 @@ class UserEditView(WgerFormMixin,
- General managers can edit every member
'''
user = request.user
- if not user.is_authenticated():
+ if not user.is_authenticated:
return HttpResponseForbidden()
if user.has_perm('gym.manage_gym') \
@@ -487,7 +487,7 @@ class UserDetailView(LoginRequiredMixin, WgerMultiplePermissionRequiredMixin, De
'''
user = request.user
- if not user.is_authenticated():
+ if not user.is_authenticated:
return HttpResponseForbidden()
if (user.has_perm('gym.manage_gym') or user.has_perm('gym.gym_trainer')) \
diff --git a/wger/email/views/gym.py b/wger/email/views/gym.py
index c4483aa43..3a7bc22f6 100644
--- a/wger/email/views/gym.py
+++ b/wger/email/views/gym.py
@@ -57,7 +57,7 @@ class EmailLogListView(PermissionRequiredMixin, generic.ListView):
'''
Can only view email list for own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
if request.user.userprofile.gym_id != int(self.kwargs['gym_pk']):
@@ -93,7 +93,7 @@ class EmailListFormPreview(FormPreview):
Also, check for permissions here. While it is ugly and doesn't really
belong here, it seems it's the best way to do it in a FormPreview
'''
- if not request.user.is_authenticated() or\
+ if not request.user.is_authenticated or\
request.user.userprofile.gym_id != self.gym.id or \
not request.user.has_perms('core.change_emailcron'):
return HttpResponseForbidden()
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index ce9617e15..78e11d576 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -161,7 +161,7 @@ def view(request, id, slug=None):
# rendering in the D3 chart
entry_log = []
chart_data = []
- if request.user.is_authenticated():
+ if request.user.is_authenticated:
logs = WorkoutLog.objects.filter(user=request.user, exercise=exercise)
entry_log, chart_data = process_log_entries(logs)
@@ -270,7 +270,7 @@ class ExerciseCorrectView(ExercisesEditAddView, LoginRequiredMixin, UpdateView):
'''
Only registered users can correct exercises
'''
- if not request.user.is_authenticated() or request.user.userprofile.is_temporary:
+ if not request.user.is_authenticated or request.user.userprofile.is_temporary:
return HttpResponseForbidden()
return super(ExerciseCorrectView, self).dispatch(request, *args, **kwargs)
diff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.py
index fbfc696f2..72417044f 100644
--- a/wger/gym/views/admin_notes.py
+++ b/wger/gym/views/admin_notes.py
@@ -66,7 +66,7 @@ class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
'''
Can only add notes to users in own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
user = User.objects.get(pk=self.kwargs['user_pk'])
@@ -107,7 +107,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
'''
Can only add notes to users in own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
user = User.objects.get(pk=self.kwargs['user_pk'])
@@ -156,7 +156,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
Only trainers for this gym can edit user notes
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
note = self.get_object()
@@ -193,7 +193,7 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
'''
Only trainers for this gym can delete user notes
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
note = self.get_object()
diff --git a/wger/gym/views/contract.py b/wger/gym/views/contract.py
index 093b1f244..a52bbfad5 100644
--- a/wger/gym/views/contract.py
+++ b/wger/gym/views/contract.py
@@ -85,7 +85,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
'''
Can only add documents to users in own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
user = get_object_or_404(User, pk=self.kwargs['user_pk'])
@@ -125,7 +125,7 @@ class DetailView(LoginRequiredMixin, PermissionRequiredMixin, DetailView):
'''
Can only see contracts for own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
contract = self.get_object()
@@ -149,7 +149,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
Only trainers for this gym can edit user notes
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
contract = self.get_object()
@@ -185,7 +185,7 @@ class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
'''
Can only list contract types in own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
self.member = get_object_or_404(User, id=self.kwargs['user_pk'])
diff --git a/wger/gym/views/contract_option.py b/wger/gym/views/contract_option.py
index d6688cc88..96896c5ce 100644
--- a/wger/gym/views/contract_option.py
+++ b/wger/gym/views/contract_option.py
@@ -71,7 +71,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
'''
Can only add contract types in own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
if request.user.userprofile.gym_id != int(self.kwargs['gym_pk']):
@@ -110,7 +110,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
'''
Can only add contract types in own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
contract_type = self.get_object()
@@ -148,7 +148,7 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
'''
Can only add contract option in own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
contract_type = self.get_object()
@@ -191,7 +191,7 @@ class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
'''
Can only list contract types in own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
self.gym = get_object_or_404(Gym, id=self.kwargs['gym_pk'])
diff --git a/wger/gym/views/contract_type.py b/wger/gym/views/contract_type.py
index a4793735a..06df1188a 100644
--- a/wger/gym/views/contract_type.py
+++ b/wger/gym/views/contract_type.py
@@ -71,7 +71,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
'''
Can only add contract types in own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
if request.user.userprofile.gym_id != int(self.kwargs['gym_pk']):
@@ -110,7 +110,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
'''
Can only add contract types in own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
contract_type = self.get_object()
@@ -148,7 +148,7 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
'''
Can only add contract types in own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
contract_type = self.get_object()
@@ -191,7 +191,7 @@ class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
'''
Can only list contract types in own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
self.gym = get_object_or_404(Gym, id=self.kwargs['gym_pk'])
diff --git a/wger/gym/views/document.py b/wger/gym/views/document.py
index 175703278..ef221a6f9 100644
--- a/wger/gym/views/document.py
+++ b/wger/gym/views/document.py
@@ -66,7 +66,7 @@ class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
'''
Can only add notes to users in own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
user = User.objects.get(pk=self.kwargs['user_pk'])
@@ -107,7 +107,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
'''
Can only add documents to users in own gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
user = User.objects.get(pk=self.kwargs['user_pk'])
@@ -159,7 +159,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
Only trainers for this gym can edit user notes
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
note = self.get_object()
@@ -196,7 +196,7 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
'''
Only trainers for this gym can delete documents
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
note = self.get_object()
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index d7955762b..0cdea25c4 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -166,7 +166,7 @@ def gym_new_user_info(request):
'''
Shows info about a newly created user
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
if not request.session.get('gym.user'):
@@ -186,7 +186,7 @@ def gym_new_user_info_export(request):
'''
Exports the info of newly created user
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
if not request.session.get('gym.user'):
@@ -226,7 +226,7 @@ def reset_user_password(request, user_pk):
user = get_object_or_404(User, pk=user_pk)
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
if not request.user.has_perm('gym.manage_gyms') \
@@ -253,7 +253,7 @@ def gym_permissions_user_edit(request, user_pk):
member = get_object_or_404(User, pk=user_pk)
user = request.user
- if not user.is_authenticated():
+ if not user.is_authenticated:
return HttpResponseForbidden()
if not user.has_perm('gym.manage_gyms') and not user.has_perm('gym.manage_gym'):
@@ -340,7 +340,7 @@ class GymAddUserView(WgerFormMixin,
'''
Only managers for this gym can add new members
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
if not request.user.has_perm('gym.manage_gyms') \
@@ -430,7 +430,7 @@ class GymUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,
'''
Only managers for this gym and general managers can edit the gym
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
if request.user.has_perm('gym.manage_gym') \
diff --git a/wger/gym/views/user_config.py b/wger/gym/views/user_config.py
index 23ec40f49..fdb8a4ee6 100644
--- a/wger/gym/views/user_config.py
+++ b/wger/gym/views/user_config.py
@@ -49,7 +49,7 @@ class ConfigUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi
Only managers for this gym can edit the user settings
'''
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseForbidden()
config = self.get_object()
diff --git a/wger/manager/views/ical.py b/wger/manager/views/ical.py
index 4f89da6d9..89f82c334 100644
--- a/wger/manager/views/ical.py
+++ b/wger/manager/views/ical.py
@@ -126,7 +126,7 @@ def export(request, pk, uidb64=None, token=None):
else:
return HttpResponseForbidden()
else:
- if request.user.is_anonymous():
+ if request.user.is_anonymous:
return HttpResponseForbidden()
workout = get_object_or_404(Workout, pk=pk, user=request.user)
@@ -157,7 +157,7 @@ def export_schedule(request, pk, uidb64=None, token=None):
else:
return HttpResponseForbidden()
else:
- if request.user.is_anonymous():
+ if request.user.is_anonymous:
return HttpResponseForbidden()
schedule = get_object_or_404(Schedule, pk=pk, user=request.user)
diff --git a/wger/manager/views/pdf.py b/wger/manager/views/pdf.py
index 3e9767da1..6e8504ec2 100644
--- a/wger/manager/views/pdf.py
+++ b/wger/manager/views/pdf.py
@@ -63,7 +63,7 @@ def workout_log(request, id, images=False, comments=False, uidb64=None, token=No
else:
return HttpResponseForbidden()
else:
- if request.user.is_anonymous():
+ if request.user.is_anonymous:
return HttpResponseForbidden()
workout = get_object_or_404(Workout, pk=id, user=request.user)
@@ -131,7 +131,7 @@ def workout_view(request, id, images=False, comments=False, uidb64=None, token=N
else:
return HttpResponseForbidden()
else:
- if request.user.is_anonymous():
+ if request.user.is_anonymous:
return HttpResponseForbidden()
workout = get_object_or_404(Workout, pk=id, user=request.user)
diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.py
index 893f9be92..b8a70c178 100644
--- a/wger/manager/views/schedule.py
+++ b/wger/manager/views/schedule.py
@@ -131,7 +131,7 @@ def export_pdf_log(request, pk, images=False, comments=False, uidb64=None, token
else:
return HttpResponseForbidden()
else:
- if request.user.is_anonymous():
+ if request.user.is_anonymous:
return HttpResponseForbidden()
schedule = get_object_or_404(Schedule, pk=pk, user=user)
@@ -196,7 +196,7 @@ def export_pdf_table(request, pk, images=False, comments=False, uidb64=None, tok
else:
return HttpResponseForbidden()
else:
- if request.user.is_anonymous():
+ if request.user.is_anonymous:
return HttpResponseForbidden()
schedule = get_object_or_404(Schedule, pk=pk, user=user)
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index b6cc34fbd..21622b82b 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -233,7 +233,7 @@ def export_pdf(request, id, uidb64=None, token=None):
else:
return HttpResponseForbidden()
else:
- if request.user.is_anonymous():
+ if request.user.is_anonymous:
return HttpResponseForbidden()
plan = get_object_or_404(NutritionPlan, pk=id, user=request.user)
diff --git a/wger/utils/context_processor.py b/wger/utils/context_processor.py
index 3d179af6b..5d715a2b4 100644
--- a/wger/utils/context_processor.py
+++ b/wger/utils/context_processor.py
@@ -107,7 +107,7 @@ def get_custom_header(request):
# Current gym
current_gym = None
- if request.user.is_authenticated() and request.user.userprofile.gym:
+ if request.user.is_authenticated and request.user.userprofile.gym:
current_gym = request.user.userprofile.gym
else:
global_gymconfig = GymConfig.objects.get(pk=1)
diff --git a/wger/utils/generic_views.py b/wger/utils/generic_views.py
index 5dfd1336b..1328f93af 100644
--- a/wger/utils/generic_views.py
+++ b/wger/utils/generic_views.py
@@ -85,7 +85,7 @@ class WgerPermissionMixin(object):
'''
if self.login_required or self.permission_required:
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
return HttpResponseRedirect(reverse_lazy('core:user:login')
+ '?next={0}'.format(request.path))
diff --git a/wger/utils/helpers.py b/wger/utils/helpers.py
index cb928b2ce..14f11718f 100644
--- a/wger/utils/helpers.py
+++ b/wger/utils/helpers.py
@@ -188,7 +188,7 @@ def check_access(request_user, username=None):
# If there is no user_pk, just show the user his own data
else:
- if not request_user.is_authenticated():
+ if not request_user.is_authenticated:
raise Http404('You are not allowed to access this page.')
user = request_user
diff --git a/wger/utils/language.py b/wger/utils/language.py
index e14a15b43..847a2ad80 100644
--- a/wger/utils/language.py
+++ b/wger/utils/language.py
@@ -102,7 +102,7 @@ def load_ingredient_languages(request):
languages = load_item_languages(LanguageConfig.SHOW_ITEM_INGREDIENTS)
# Only registered users have a profile
- if request.user.is_authenticated():
+ if request.user.is_authenticated:
profile = request.user.userprofile
show_english = profile.show_english_ingredients
diff --git a/wger/utils/middleware.py b/wger/utils/middleware.py
index 3f91adcb2..90993a2e1 100644
--- a/wger/utils/middleware.py
+++ b/wger/utils/middleware.py
@@ -68,7 +68,7 @@ def get_user(request):
# Django didn't find a user, so create one now
if settings.WGER_SETTINGS['ALLOW_GUEST_USERS'] and \
request.method == 'GET' and \
- create_user and not user.is_authenticated():
+ create_user and not user.is_authenticated:
logger.debug('creating a new guest user now')
user = create_temporary_user()
diff --git a/wger/utils/pdf.py b/wger/utils/pdf.py
index bb7925fb3..3fcdfa225 100644
--- a/wger/utils/pdf.py
+++ b/wger/utils/pdf.py
@@ -73,7 +73,7 @@ def load_ingredient_languages(request):
languages = (language.id,)
# Only registered users have a profile
- if request.user.is_authenticated():
+ if request.user.is_authenticated:
profile = request.user.userprofile
show_english = profile.show_english_ingredients
diff --git a/wger/utils/permissions.py b/wger/utils/permissions.py
index ada4c5695..9d4ab95a4 100644
--- a/wger/utils/permissions.py
+++ b/wger/utils/permissions.py
@@ -37,7 +37,7 @@ class WgerPermission(permissions.BasePermission):
view. If it is not present, treat is as a public endpoint
'''
if hasattr(view, 'is_private') and view.is_private:
- return request.user and request.user.is_authenticated()
+ return request.user and request.user.is_authenticated
return True
def has_object_permission(self, request, view, obj):
@@ -69,7 +69,7 @@ class CreateOnlyPermission(permissions.BasePermission):
def has_permission(self, request, view):
return (request.method in ['GET', 'HEAD', 'OPTIONS'] or
(request.user and
- request.user.is_authenticated() and
+ request.user.is_authenticated and
request.method == 'POST'))
@@ -81,5 +81,5 @@ class UpdateOnlyPermission(permissions.BasePermission):
def has_permission(self, request, view):
return (request.user and
- request.user.is_authenticated() and
+ request.user.is_authenticated and
request.method in ['GET', 'HEAD', 'OPTIONS', 'PATCH'])