Fix for #1387 (saving settings with enabled gdrive metadata watch led to crash)

cps/admin.py

@@ -178,9 +178,6 @@ def update_view_configuration():
     _config_int("config_authors_max")
     _config_int("config_restricted_column")
 
-    if config.config_google_drive_watch_changes_response:
-        config.config_google_drive_watch_changes_response = json.dumps(config.config_google_drive_watch_changes_response)
-
     config.config_default_role = constants.selected_roles(to_save)
     config.config_default_role &= ~constants.ROLE_ANONYMOUS
 

cps/config_sql.py

@@ -279,6 +279,10 @@ class _ConfigSQL(object):
         '''Apply all configuration values to the underlying storage.'''
         s = self._read_from_storage()  # type: _Settings
 
+        if self.config_google_drive_watch_changes_response:
+            self.config_google_drive_watch_changes_response = json.dumps(
+                self.config_google_drive_watch_changes_response)
+
         for k, v in self.__dict__.items():
             if k[0] == '_':
                 continue