From 0229dba4eebdbc2ff9dc920ee0bf55ff455e6122 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 26 May 2020 08:04:55 +0200 Subject: [PATCH 1/2] bug fix --- rowers/dataprep.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 252e2bd9..b5712d7a 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1905,7 +1905,10 @@ def testdata(time, distance, pace, spm): def getrowdata_db(id=0, doclean=False, convertnewtons=True, checkefficiency=True): data = read_df_sql(id) - data['deltat'] = data['time'].diff() + try: + data['deltat'] = data['time'].diff() + except KeyError: + data = pd.DataFrame() if data.empty: rowdata, row = getrowdata(id=id) From 2a4991f7f7e44c149bd9db29b1f00d5da3cd4f14 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 26 May 2020 20:17:43 +0200 Subject: [PATCH 2/2] fixed settings --- rowsandall_app/settings.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 75ee64e3..680f9615 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -42,7 +42,9 @@ TESTING = False ALLOWED_HOSTS = CFG['allowed_hosts'] - +OAUTH2_PROVIDER_ACCESS_TOKEN_MODEL = 'oauth2_provider.AccessToken' +OAUTH2_PROVIDER_APPLICATION_MODEL = 'oauth2_provider.Application' +OAUTH2_PROVIDER_REFRESH_TOKEN_MODEL = 'oauth2_provider.RefreshToken' # Application definition INSTALLED_APPS = [