Merge branch 'release/v18.6.18'

rowers/templates/alerts.html

@@ -95,6 +95,7 @@
   var percentage = json['stats']['percentage'];
   var startdate = json['stats']['startdate'];
   var enddate = json['stats']['enddate'];
+  console.log(percentage, startdate, enddate)
   thediv.siblings("#percentages").find("#percentage").text(percentage);
   thediv.siblings("#dates").find("#startdate").text(startdate);
   thediv.siblings("#dates").find("#enddate").text(enddate);

rowers/views/analysisviews.py

@@ -1958,7 +1958,7 @@ def alert_report_view(request, id=0, userid=0, nperiod=0):
     stats = alert_get_stats(alert, nperiod=nperiod)
 
     is_ajax = request_is_ajax(request)
-    if not is_ajax:
+    if is_ajax:
         return JSONResponse({
             "stats": stats,
         })

rowers/views/userviews.py

@@ -377,7 +377,7 @@ def rower_exportsettings_view(request, userid=0):
         'nk_auto_import': 'nktoken'
     }
     r = getrequestrowercoachee(request, userid=userid)
-    
+
     if request.method == 'POST':
         form = RowerExportForm(request.POST)
         if form.is_valid():
@@ -392,8 +392,10 @@ def rower_exportsettings_view(request, userid=0):
                 doset = True
                 try:
                     tokenname = attrtokens[attr]
-                    if getattr(r, tokenname) == '' or getattr(r, tokenname) is None:
+                    if (getattr(r, tokenname) == '' or getattr(r, tokenname) is None) and value:
-                        doset = False
+                        messages.error(
+                            request, 'Set '+attr+' but it will not be effective until you create a connection.'
+                        )
                 except KeyError:
                     doset = True
                 if not user_is_not_basic(r.user):  # pragma: no cover