8000 Fix is authenticated · socketpy/django-jet@eabb6a7 · GitHub
[go: up one dir, main page]
Skip to content

Commit eabb6a7

Browse files
f1nalityf1nality
committed
Fix is authenticated
1 parent 200ba40 commit eabb6a7

File tree

4 files changed

+22
-13
lines changed

4 files changed

+22
-13
lines changed

‎jet/dashboard/forms.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from django.core.exceptions import ValidationError
44
from jet.dashboard.models import UserDashboardModule
55
from jet.dashboard.utils import get_current_dashboard
6+
from jet.utils import user_is_authenticated
67

78

89
class UpdateDashboardModulesForm(forms.Form):
@@ -17,7 +18,7 @@ def __init__(self, request, *args, **kwargs):
1718
def clean(self):
1819
data = super(UpdateDashboardModulesForm, self).clean()
1920

20-
if not self.request.user.is_authenticated or not self.request.user.is_staff:
21+
if not user_is_authenticated(self.request.user) or not self.request.user.is_staff:
2122
raise ValidationError('error')
2223

2324
try:
@@ -68,7 +69,7 @@ def clean_app_label(self):
6869
def clean(self):
6970
data = super(AddUserDashboardModuleForm, self).clean()
7071

71-
if not self.request.user.is_authenticated or not self.request.user.is_staff:
72+
if not user_is_authenticated(self.request.user) or not self.request.user.is_staff:
7273
raise ValidationError('error')
7374

7475
if 'app_label' in data:
@@ -110,7 +111,7 @@ class Meta:
110111
def clean(self):
111112
data = super(UpdateDashboardModuleCollapseForm, self).clean()
112113

113-
if not self.request.user.is_authenticated or not self.request.user.is_staff:
114+
if not user_is_authenticated(self.request.user) or not self.request.user.is_staff:
114115
raise ValidationError('error')
115116

116117
if self.instance.user != self.request.user.pk:
@@ -131,7 +132,7 @@ class Meta:
131132
def clean(self):
132133
cleaned_data = super(RemoveDashboardModuleForm, self).clean()
133134

134-
if not self.request.user.is_authenticated or self.instance.user != self.request.user.pk:
135+
if not user_is_authenticated(self.request.user) or self.instance.user != self.request.user.pk:
135136
raise ValidationError('error')
136137

137138
return cleaned_data
@@ -156,7 +157,7 @@ def clean(self):
156157
data = super(ResetDashboardForm, self).clean()
157158
data['app_label'] = data['app_label'] if data['app_label'] else None
158159

159-
if not self.request.user.is_authenticated or not self.request.user.is_staff:
160+
if not user_is_authenticated(self.request.user) or not self.request.user.is_staff:
160161
raise ValidationError('error')
161162

162163
return data

‎jet/dashboard/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from jet.dashboard.forms import UpdateDashboardModulesForm, AddUserDashboardModuleForm, \
1212
UpdateDashboardModuleCollapseForm, RemoveDashboardModuleForm, ResetDashboardForm
1313
from jet.dashboard.models import UserDashboardModule
14-
from jet.utils import JsonResponse, get_app_list, SuccessMessageMixin
14+
from jet.utils import JsonResponse, get_app_list, SuccessMessageMixin, user_is_authenticated
1515
from django.views.generic import UpdateView
1616
from django.utils.translation import ugettext_lazy as _
1717

@@ -216,7 +216,7 @@ def load_dashboard_module_view(request, pk):
216216
result = {'error': False}
217217

218218
try:
219-
if not request.user.is_authenticated or not request.user.is_staff:
219+
if not user_is_authenticated(request.user) or not request.user.is_staff:
220220
raise ValidationError('error')
221221

222222
instance = UserDashboardModule.objects.get(pk=pk, user=request.user.pk)

‎jet/forms.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
from django.core.exceptions import ValidationError
66
from django.db.models import Q
77
import operator
8+
89
from jet.models import Bookmark, PinnedApplication
9-
from jet.utils import get_model_instance_label
10+
from jet.utils import get_model_instance_label, user_is_authenticated
1011
from functools import reduce
1112

1213
try:
@@ -27,7 +28,7 @@ class Meta:
2728

2829
def clean(self):
2930
data = super(AddBookmarkForm, self).clean()
30-
if not self.request.user.is_authenticated or not self.request.user.is_staff:
31+
if not user_is_authenticated(self.request.user) or not self.request.user.is_staff:
3132
raise ValidationError('error')
3233
if not self.request.user.has_perm('jet.change_bookmark'):
3334
raise ValidationError('error')
@@ -49,7 +50,7 @@ class Meta:
4950

5051
def clean(self):
5152
data = super(RemoveBookmarkForm, self).clean()
52-
if not self.request.user.is_authenticated or not self.request.user.is_staff:
53+
if not user_is_authenticated(self.request.user) or not self.request.user.is_staff:
5354
raise ValidationError('error')
5455
if self.instance.user != self.request.user.pk:
5556
raise ValidationError('error')
@@ -71,7 +72,7 @@ class Meta:
7172

7273
def clean(self):
7374
data = super(ToggleApplicationPinForm, self).clean()
74-
if not self.request.user.is_authenticated or not self.request.user.is_staff:
75+
if not user_is_authenticated(self.request.user) or not self.request.user.is_staff:
7576
raise ValidationError('error')
7677
return data
7778

@@ -108,7 +109,7 @@ def __init__(self, request, *args, **kwargs):
108109
def clean(self):
109110
data = super(ModelLookupForm, self).clean()
110111

111-
if not self.request.user.is_authenticated or not self.request.user.is_staff:
112+
if not user_is_authenticated(self.request.user) or not self.request.user.is_staff:
112113
raise ValidationError('error')
113114

114115
try:

‎jet/utils.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ def get_possible_language_codes():
250250

251251

252252
def get_original_menu_items(context):
253-
if context.get('user') and context['user'].is_authenticated:
253+
if context.get('user') and user_is_authenticated(context['user']):
254254
pinned_apps = PinnedApplication.objects.filter(user=context['user'].pk).values_list('app_label', flat=True)
255255
else:
256256
pinned_apps = []
@@ -447,3 +447,10 @@ def context_to_dict(context):
447447
context = flat
448448

449449
return context
450+
451+
452+
def user_is_authenticated(user):
453+
if not hasattr(user.is_authenticated, '__call__'):
454+
return user.is_authenticated
455+
else:
456+
return user.is_authenticated()

0 commit comments

Comments
 (0)
0