Merge remote-tracking branch 'origin/master' into master

2020-08-21 19:27:19 +02:00
parent 0cc07362b8 4d44746a88
commit b9c0f2a3d3
2 changed files with 3 additions and 12 deletions
--- a/cps/gdrive.py
+++ b/cps/gdrive.py
@@ -93,8 +93,7 @@ def watch_gdrive():
        try:
            result = gdriveutils.watchChange(gdriveutils.Gdrive.Instance().drive, notification_id,
                               'web_hook', address, gdrive_watch_callback_token, current_milli_time() + 604800*1000)
-            # config.config_google_drive_watch_changes_response = json.dumps(result)
-            # after save(), config_google_drive_watch_changes_response will be a json object, not string
+            config.config_google_drive_watch_changes_response = result
            config.save()
        except HttpError as e:
            reason=json.loads(e.content)['error']['errors'][0]