sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v18.6.18'

Browse Source
This commit is contained in:
Sander Roosendaal
2022-09-15 09:45:25 +02:00
parent 8f24b74eff 81b313dc56
commit 1ea61b870b
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/templates/alerts.html
View File

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

2
rowers/views/analysisviews.py
View File

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

6
rowers/views/userviews.py
View File

@@ -392,8 +392,10 @@ def rower_exportsettings_view(request, userid=0):
doset = True doset = True
try: try:
tokenname = attrtokens[attr] 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: except KeyError:
doset = True doset = True
if not user_is_not_basic(r.user): # pragma: no cover if not user_is_not_basic(r.user): # pragma: no cover