Merge branch 'release/v15.7.1'

rowers/views/analysisviews.py

@@ -5022,7 +5022,7 @@ def alert_edit_view(request,id=0,userid=0):
 # alert delete view
 
 class AlertDelete(DeleteView):
-    login_requird = True
+    login_required = True
     model = Alert
     template_name = 'alert_delete_confirm.html'
 

rowers/views/importviews.py

@@ -752,6 +752,16 @@ def rower_process_garmincallback(request):
     url = reverse('rower_exportsettings_view')
     return HttpResponseRedirect(url)
 
+# Process NK Callback
+@login_required()
+def rower_process_nkcallback(request):
+    # do stuff
+
+    url = reverse('rower_exportsettings_view')
+
+    return HttpResponseRedirect(url)
+
+
 # Process Strava Callback
 @login_required()
 def rower_process_stravacallback(request):
@@ -1286,22 +1296,23 @@ def strava_webhook_view(request):
                     f.write(' ')
                     f.write('Rower not found')
                 return HttpResponse(status=200)
-            for key, value in updates.items():
-                for w in ws:
-                    if key == 'title':
-                        w.name = value
-                        w.save()
-                    if key == 'type':
-                        try:
-                            w.workouttype = mytypes.stravamappinginv[value]
+            if r.strava_auto_import:
+                for key, value in updates.items():
+                    for w in ws:
+                        if key == 'title':
+                            w.name = value
                             w.save()
-                        except KeyError:
-                            with open('strava_webhooks.log','a') as f:
-                                f.write('\n')
-                                f.write(timestamp)
-                                f.write(' ')
-                                f.write('Workout type not found: '+str(value))
-            return HttpResponse(status=200)
+                        if key == 'type':
+                            try:
+                                w.workouttype = mytypes.stravamappinginv[value]
+                                w.save()
+                            except KeyError:
+                                with open('strava_webhooks.log','a') as f:
+                                    f.write('\n')
+                                    f.write(timestamp)
+                                    f.write(' ')
+                                    f.write('Workout type not found: '+str(value))
+                return HttpResponse(status=200)
 
     return HttpResponse(status=200)
 

rowsandall_app/urls.py

@@ -70,6 +70,7 @@ urlpatterns += [
 #    re_path(r'^cvkbrno/',include('cvkbrno.urls')),
 #    re_path(r'^admin/rq/',include('django_rq_dashboard.urls')),
     re_path(r'^call\_back',rowersviews.rower_process_callback),
+    re_path(r'^nk\_callback',rowersviews.rower_process_nkcallback),
     re_path(r'^stravacall\_back',rowersviews.rower_process_stravacallback),
     re_path(r'^garmin\_callback',rowersviews.rower_process_garmincallback),
     re_path(r'^sporttracks\_callback',rowersviews.rower_process_sporttrackscallback),