mirror of
https://github.com/janeczku/calibre-web
synced 2024-12-25 09:30:31 +00:00
Fix for #1387 (saving settings with enabled gdrive metadata watch led to crash)
This commit is contained in:
parent
013793f989
commit
5405dc5141
@ -178,9 +178,6 @@ def update_view_configuration():
|
|||||||
_config_int("config_authors_max")
|
_config_int("config_authors_max")
|
||||||
_config_int("config_restricted_column")
|
_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.selected_roles(to_save)
|
||||||
config.config_default_role &= ~constants.ROLE_ANONYMOUS
|
config.config_default_role &= ~constants.ROLE_ANONYMOUS
|
||||||
|
|
||||||
|
@ -279,6 +279,10 @@ class _ConfigSQL(object):
|
|||||||
'''Apply all configuration values to the underlying storage.'''
|
'''Apply all configuration values to the underlying storage.'''
|
||||||
s = self._read_from_storage() # type: _Settings
|
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():
|
for k, v in self.__dict__.items():
|
||||||
if k[0] == '_':
|
if k[0] == '_':
|
||||||
continue
|
continue
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
# GDrive Integration
|
# GDrive Integration
|
||||||
google-api-python-client==1.7.11,<1.8.0
|
google-api-python-client==1.7.11,<1.8.0
|
||||||
gevent>=1.2.1,<20.6.0
|
#gevent>=1.2.1,<20.6.0
|
||||||
greenlet>=0.4.12,<0.5.0
|
greenlet>=0.4.12,<0.5.0
|
||||||
httplib2>=0.9.2,<0.18.0
|
httplib2>=0.9.2,<0.18.0
|
||||||
oauth2client>=4.0.0,<4.14.0
|
oauth2client>=4.0.0,<4.1.4
|
||||||
uritemplate>=3.0.0,<3.1.0
|
uritemplate>=3.0.0,<3.1.0
|
||||||
pyasn1-modules>=0.0.8,<0.3.0
|
pyasn1-modules>=0.0.8,<0.3.0
|
||||||
pyasn1>=0.1.9,<0.5.0
|
pyasn1>=0.1.9,<0.5.0
|
||||||
|
Loading…
Reference in New Issue
Block a user