Merge branch 'release/v13.71'
This commit is contained in:
@@ -170,7 +170,10 @@ class WorkoutSerializer(serializers.ModelSerializer):
|
||||
|
||||
def create(self, validated_data):
|
||||
print(validated_data)
|
||||
r = Rower.objects.get(user=self.context['request'].user)
|
||||
if self.context['request'].user.is_authenticated:
|
||||
r = Rower.objects.get(user=self.context['request'].user)
|
||||
else:
|
||||
raise PermissionDenied("Not allowed")
|
||||
d = validated_data['date']
|
||||
t = validated_data['starttime']
|
||||
rowdatetime = datetime.datetime(d.year,
|
||||
|
||||
@@ -3127,7 +3127,7 @@ def virtualevent_submit_result_view(request,id=0,workoutid=0):
|
||||
workouttype__in=mytypes.rowtypes,
|
||||
startdatetime__gte=startdatetime,
|
||||
startdatetime__lte=enddatetime,
|
||||
).order_by("date","startdatetime","id")
|
||||
).order_by("-date","-startdatetime","id")
|
||||
|
||||
if not ws:
|
||||
messages.info(
|
||||
|
||||
@@ -416,7 +416,7 @@ OAUTH2_PROVIDER = {
|
||||
'ACCESS_TOKEN_MODEL': 'oauth2_provider.AccessToken',
|
||||
'APPLICATION_MODEL': 'oauth2_provider.Application',
|
||||
'REFRESH_TOKEN_MODEL': 'oauth2_provider.RefreshToken',
|
||||
'ACCESS_TOKEN_EXPIRE_SECONDS': 3600,
|
||||
'ACCESS_TOKEN_EXPIRE_SECONDS': 36000,
|
||||
#'OAUTH2_BACKEND_CLASS': 'oauth2_provider.oauth2_backends.JSONOAuthLibCore'
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user